From b953ead7963ebd1bae13c87047672bb466a46768 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Mar 2019 06:55:02 +0100
Subject: [PATCH] fix merge errors

---
 doc/README.Dist-Layout | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
index ecdc5e214..0b58c09e2 100644
--- a/doc/README.Dist-Layout
+++ b/doc/README.Dist-Layout
@@ -78,14 +78,7 @@ In order to convert to this layout you need to do the following in the seeddms51
 directory (replace seeddms-5.1.x with you installed version of seeddms):
 
 ln -s seeddms-5.1.x seeddms
-<<<<<<< HEAD
-mv seeddms-5.1.x/conf .
-rm www
-mkdir www
-mv seeddms-5.1.x/ext www
-=======
 mv www/conf .
->>>>>>> seeddms-5.1.x
 cd www
 rm inc op out views controllers styles languages webdav restapi pdfviewer index.php
 ln -s ../seeddms/inc