Update format_bonds.py

Maybe this change is more clear... Note the deletion of the "autopep8" stuff formerly in line 254ff.
Pymol-Scripts · Apr 21, 2015 · 996de9a · 996de9a
1 parent 9fba882
commit 996de9a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/format_bonds.py b/format_bonds.py
@@ -251,13 +251,9 @@ def format_bonds(
         ['CZ', 'NH1'],
         ['CZ', 'NH2']
     ]
-<<<<<<< HEAD
+
     ARG_bonds_double=[
     ['CZ','NH1']
-=======
-    ARG_bonds_double = [
-        ['C', 'NH1']
->>>>>>> autopep8
     ]
 
     ##### FORMATING #####