From f0312c94b0f72a326f261532f457de421f0aed61 Mon Sep 17 00:00:00 2001
From: Stefan Hammer <stefan.hammer@uni-leipzig.de>
Date: Mon, 11 Dec 2017 17:32:45 +0100
Subject: [PATCH] Fix setup.py

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index a94142b..c90e2e5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,7 @@ def read(fname):
     test_suite="tests",
     install_requires=[
                     ],
-<<<<<<< HEAD
-    scripts=['bin/design-cofold.py','bin/design-generategraphml.py','bin/design-multistate.py','bin/design-printgraphml.py','bin/design-thermoswitch.py','bin/design-ligand_switch.py'],
-=======
     scripts=['bin/design-cofold.py','bin/design-generategraphml.py','bin/design-multistate.py','bin/design-printgraphml.py','bin/design-thermoswitch.py','bin/design-ligandswitch.py'],
->>>>>>> master
     long_description=read('README.rst'),
     classifiers=[
         "Development Status :: 5 - Production/Stable",