r18467 - /branches/frame_order_testing/generic_fns/structure/main.py -- February 13, 2013 - 16:46

Author: bugman
Date: Wed Feb 13 16:46:14 2013
New Revision: 18467

URL: http://svn.gna.org/viewcvs/relax?rev=18467&view=rev
Log:
Fix for the faulty svnmerge changes of the previous commit.


Modified:
    branches/frame_order_testing/generic_fns/structure/main.py

Modified: branches/frame_order_testing/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/main.py?rev=18467&r1=18466&r2=18467&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/main.py (original)
+++ branches/frame_order_testing/generic_fns/structure/main.py Wed Feb 13 
16:46:14 2013
@@ -377,25 +377,15 @@
         except RelaxError:
             spin_cont = return_spin(id)
 
-<<<<<<< .working
         # Append all the spin ID info for printing later.
-        mol_names.append(mol_name)
+        if mol_name_target:
+            mol_names.append(mol_name_target)
+        else:
+            mol_names.append(mol_name)
         res_nums.append(res_num)
         res_names.append(res_name)
         spin_nums.append(atom_num)
         spin_names.append(atom_name)
-=======
-        # Append all the spin ID info for the first model for printing later.
-        if model_index == 0:
-            if mol_name_target:
-                mol_names.append(mol_name_target)
-            else:
-                mol_names.append(mol_name)
-            res_nums.append(res_num)
-            res_names.append(res_name)
-            spin_nums.append(atom_num)
-            spin_names.append(atom_name)
->>>>>>> .merge-right.r18465
 
         # Position vector.
         spin_cont.pos = pos