From f976acc3a543fab37b32d9925d953e3a2c1c4bd1 Mon Sep 17 00:00:00 2001
From: Sam Pullman <samantha_pullman@hms.harvard.edu>
Date: Wed, 24 Jan 2024 14:46:56 -0500
Subject: [PATCH] Container Version conflict fix

---
 Container/Dockerfile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Container/Dockerfile b/Container/Dockerfile
index 7c6eac8..5aa0482 100644
--- 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