f

AD-SDL · Mar 1, 2024 · 6141da1 · 6141da1
1 parent a2a3458
commit 6141da1
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,11 +22,4 @@ RUN --mount=type=cache,target=/root/.cache \
     pip install -e ./hudson_platecrane_module
 
 CMD ["python", "hudson_platecrane_module/src/sciclops_rest_node.py"]
-<<<<<<< HEAD
-=======
-
-# Add user to video group to access hudson_platecrane
-RUN usermod -a -G video app
-
->>>>>>> b6c05324ef588685558bdbf33fcfa974c3672eae
 #########################################