From 112daad4916dc09a67c683be9c1e5ce517b518b5 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Tue, 8 May 2018 22:41:10 +0200
Subject: [PATCH] fix

---
 start.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/start.sh b/start.sh
index fe48ddb..9aa567f 100644
--- a/start.sh
+++ b/start.sh
@@ -11,7 +11,4 @@ mkdir /opt/meshviewer/build/data
 mkdir /opt/meshviewer/build/data/tdf4
 mkdir /opt/meshviewer/build/data/tdf5
 mkdir /opt/meshviewer/build/data/tdf6
-<<<<<<< HEAD
 mkdir /opt/meshviewer/build/data/tdf7
-=======
->>>>>>> 500376bbc36fb4b937355647fdbecb3e2a41db66