r14288 - /branches/gui_testing/gui/analyses/execute.py -- August 09, 2011 - 13:47

Author: bugman
Date: Tue Aug  9 13:47:15 2011
New Revision: 14288

URL: http://svn.gna.org/viewcvs/relax?rev=14288&view=rev
Log:
Properly removed the conflict of r14287.


Modified:
    branches/gui_testing/gui/analyses/execute.py

Modified: branches/gui_testing/gui/analyses/execute.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/execute.py?rev=14288&r1=14287&r2=14288&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/execute.py (original)
+++ branches/gui_testing/gui/analyses/execute.py Tue Aug  9 13:47:15 2011
@@ -98,12 +98,6 @@
             if status.exec_lock.locked():
                 status.exec_lock.release()
 
-<<<<<<< .working
-        # Display the results viewer.
-        if self.results_display:
-            wx.CallAfter(self.gui.show_results_viewer, None)
-=======
->>>>>>> .merge-right.r14026
 
     def run_analysis(self):
         """Execute the analysis