r14423 - in /1.3: prompt/relax_data.py specific_fns/model_free/main.py -- August 24, 2011 - 13:32

Author: bugman
Date: Wed Aug 24 13:32:36 2011
New Revision: 14423

URL: http://svn.gna.org/viewcvs/relax?rev=14423&view=rev
Log:
Some fixes for an imperfect merger of the gui_testing branch at r14419.


Modified:
    1.3/prompt/relax_data.py
    1.3/specific_fns/model_free/main.py

Modified: 1.3/prompt/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_data.py?rev=14423&r1=14422&r2=14423&view=diff
==============================================================================
--- 1.3/prompt/relax_data.py (original)
+++ 1.3/prompt/relax_data.py Wed Aug 24 13:32:36 2011
@@ -361,7 +361,7 @@
     _build_doc(temp_control)
 
 
-    def write(self, ri_id=None, file=None, dir=None, bc=bc, force=False):
+    def write(self, ri_id=None, file=None, dir=None, bc=False, force=False):
         # Function intro text.
         if self._exec_info.intro:
             text = self._exec_info.ps3 + "relax_data.write("

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=14423&r1=14422&r2=14423&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Wed Aug 24 13:32:36 2011
@@ -1345,7 +1345,6 @@
         return names
 
 
-<<<<<<< .working
     def data_type(self, param=None):
         """Return the type of data, as a string, that the parameter should 
be.