Environment comment

michaelmob · Feb 5, 2019 · 5a9f96e · 5a9f96e
1 parent 9a21da1
commit 5a9f96e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -77,11 +77,7 @@ COPY ./src/front /app/front
 #
 # Environment
 # https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/deploy/env.prod.sample
-<<<<<<< HEAD
 # (Environment is at the end to avoid busting build cache on each ENV change)
-=======
-# (Environment at the end to avoid busting build cache on each ENV change)
->>>>>>> 05ca25163c27ac7652aa014f2f2ee6c72c714da1
 #
 
 ENV FUNKWHALE_HOSTNAME=yourdomain.funkwhale \