Merge pull request #144 from ccb-hms/feature/rocker-base

Container Version conflict fix
ccb-hms · Jan 24, 2024 · ae1b2cc · ae1b2cc
2 parents e22a3e2 + f976acc
commit ae1b2cc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/Container/Dockerfile b/Container/Dockerfile
@@ -353,14 +353,8 @@ RUN chmod -R 777 /usr/local/lib/R/library
 RUN chmod -R 777 /usr/local/lib/R/doc/html/packages.html
 
 # Declare which version of the container this is, and make it available inside the container 
-<<<<<<< HEAD
 ENV EPICONDUCTOR_CONTAINER_VERSION v0.4.0
 ENV EPICONDUCTOR_COLLECTION_DATE 2024-01-24
-=======
-
-ENV EPICONDUCTOR_CONTAINER_VERSION v0.3.0
-ENV EPICONDUCTOR_COLLECTION_DATE 2023-12-19
->>>>>>> origin/feature/rocker-base
 
 RUN echo "EPICONDUCTOR_CONTAINER_VERSION=$EPICONDUCTOR_CONTAINER_VERSION" >> /usr/local/lib/R/etc/Renviron.site
 RUN echo "EPICONDUCTOR_COLLECTION_DATE=$EPICONDUCTOR_COLLECTION_DATE" >> /usr/local/lib/R/etc/Renviron.site