From 32ee32517c9e999e61bda2a018c899e4b6fbd528 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 28 Jul 2018 12:49:30 +0200
Subject: [PATCH] Fix Docker merge issue

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

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
-- 
2.41.0