From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 28 Jul 2018 10:49:30 +0000 (+0200)
Subject: Fix Docker merge issue
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=32ee32517c9e999e61bda2a018c899e4b6fbd528;p=github%2Fshaarli%2FShaarli.git

Fix Docker merge issue
---

diff --git a/Dockerfile b/Dockerfile
index 10de129e..d8921cee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,7 @@ FROM python:3-alpine as docs
 ADD . /usr/src/app/shaarli
 RUN cd /usr/src/app/shaarli \
     && pip install --no-cache-dir mkdocs \
-<<<<<<< HEAD
-    && mkdocs build
-=======
     && mkdocs build --clean
->>>>>>> v0.10.0
 
 # Stage 2:
 # - Resolve PHP dependencies with Composer