r16682 - /branches/frame_order_testing/test_suite/system_tests/__init__.py -- June 06, 2012 - 10:22

Author: bugman
Date: Wed Jun  6 10:22:03 2012
New Revision: 16682

URL: http://svn.gna.org/viewcvs/relax?rev=16682&view=rev
Log:
Some fixes for the bad merge at r16679.


Modified:
    branches/frame_order_testing/test_suite/system_tests/__init__.py

Modified: branches/frame_order_testing/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/__init__.py?rev=16682&r1=16681&r2=16682&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/__init__.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/__init__.py Wed Jun  
6 10:22:03 2012
@@ -33,6 +33,7 @@
 from test_suite.system_tests.align_tensor import Align_tensor
 from test_suite.system_tests.angles import Angles
 from test_suite.system_tests.bmrb import Bmrb
+from test_suite.system_tests.bruker import Bruker
 from test_suite.system_tests.consistency_tests import Ct
 from test_suite.system_tests.dasha import Dasha
 from test_suite.system_tests.diffusion_tensor import Diffusion_tensor
@@ -44,11 +45,11 @@
 from test_suite.system_tests.model_elimination import Modelim
 from test_suite.system_tests.model_free import Mf
 from test_suite.system_tests.model_selection import Modsel
+from test_suite.system_tests.mol_res_spin import Mol_res_spin
 from test_suite.system_tests.n_state_model import N_state_model
 from test_suite.system_tests.noe import Noe
 from test_suite.system_tests.noe_restraints import Noe_restraints
 from test_suite.system_tests.palmer import Palmer
-from test_suite.system_tests.pdc import Pdc
 from test_suite.system_tests.peak_lists import Peak_lists
 from test_suite.system_tests.pipes import Pipes
 from test_suite.system_tests.rdc import Rdc