From 25868ccd96dd3f410368b7789a3618709e1d166d Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 9 Sep 2018 22:47:56 +0200
Subject: [PATCH] makedeb.sh did contain the conflict markers.

---
 scripts/makedeb.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/makedeb.sh b/scripts/makedeb.sh
index 10cda0a29..b58661e81 100755
--- a/scripts/makedeb.sh
+++ b/scripts/makedeb.sh
@@ -89,15 +89,10 @@ cd ..
 mkdir -p makedeb-tmp/${sharedir}/doc/klayout
 mkdir -p makedeb-tmp/${sharedir}/applications
 mkdir -p makedeb-tmp/${sharedir}/pixmaps
-<<<<<<< HEAD
 mkdir -p makedeb-tmp/${libdir}/db_plugins
 mkdir -p makedeb-tmp/${libdir}/lay_plugins
 mkdir -p makedeb-tmp/${pylibdir}
 mkdir -p makedeb-tmp/${bindir}
-=======
-mkdir -p makedeb-tmp/${bindir}
-mkdir -p makedeb-tmp/${libdir}
->>>>>>> master
 
 cp etc/klayout.desktop makedeb-tmp/${sharedir}/applications
 cp etc/logo.png makedeb-tmp/${sharedir}/pixmaps
@@ -108,13 +103,10 @@ cp COPYRIGHT makedeb-tmp/${sharedir}/doc/klayout/copyright
 cp -pd $bininstdir/strm* makedeb-tmp/${bindir}
 cp -pd $bininstdir/klayout makedeb-tmp/${bindir}
 cp -pd $bininstdir/lib*so* makedeb-tmp/${libdir}
-<<<<<<< HEAD
 cp -pd $bininstdir/db_plugins/lib*so* makedeb-tmp/${libdir}/db_plugins
 cp -pd $bininstdir/lay_plugins/lib*so* makedeb-tmp/${libdir}/lay_plugins
 cp -pd $bininstdir/pymod/klayout/*so makedeb-tmp/${pylibdir}
 cp -pd $bininstdir/pymod/klayout/*py makedeb-tmp/${pylibdir}
-=======
->>>>>>> master
 
 cd makedeb-tmp
 
@@ -138,13 +130,9 @@ grep -q $version ${sharedir}/doc/klayout/changelog.Debian || (
 echo "Modifying control file .."
 
 strip ${bindir}/*
-strip ${libdir}/*.so*
-<<<<<<< HEAD
 strip ${pylibdir}/*.so
 strip ${libdir}/db_plugins/*.so*
 strip ${libdir}/lay_plugins/*.so*
-=======
->>>>>>> master
 
 size=`du -ck usr | grep total | sed "s/ *total//"`