Fix setup.py

ViennaRNA · Dec 11, 2017 · f0312c9 · f0312c9
1 parent 36e46a5
commit f0312c9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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",