Merge branch 'cleanup' of https://github.com/thetarkus/docker-funkwhale…

… into cleanup
michaelmob · Feb 5, 2019 · 9a21da1 · 9a21da1
2 parents d7d6635 + 05ca251
commit 9a21da1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -77,7 +77,11 @@ 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 \