r18762 - /branches/frame_order_testing/generic_fns/selection.py -- March 11, 2013 - 12:41

Author: bugman
Date: Mon Mar 11 12:41:17 2013
New Revision: 18762

URL: http://svn.gna.org/viewcvs/relax?rev=18762&view=rev
Log:
Fixed an incorrectly repaired merge conflict from the previous revision of 
this branch.


Modified:
    branches/frame_order_testing/generic_fns/selection.py

Modified: branches/frame_order_testing/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/selection.py?rev=18762&r1=18761&r2=18762&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/selection.py (original)
+++ branches/frame_order_testing/generic_fns/selection.py Mon Mar 11 12:41:17 
2013
@@ -27,7 +27,7 @@
 
 # relax module imports.
 from generic_fns.interatomic import interatomic_loop
-from generic_fns.mol_res_spin import Selection, exists_mol_res_spin_data, 
generate_spin_id,_unique return_spin, spin_loop
+from generic_fns.mol_res_spin import Selection, exists_mol_res_spin_data, 
generate_spin_id_unique, return_spin, spin_loop
 from generic_fns import pipes
 from relax_errors import RelaxError, RelaxNoDomainError, RelaxNoSequenceError
 from relax_io import read_spin_data