Fix Docker merge issue

diff --git a/Dockerfile b/Dockerfile
index 10de129e82367aed684d14c224160536c19b6093..d8921cee4cae2820a1448635f6ad1dab6425fe0b 100644 (file)
--- 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