fix merge conflicts
authorGiovanni Gherdovich <ggherdov@brentaal.inria.fr>
Thu, 7 Oct 2010 12:40:19 +0000 (14:40 +0200)
committerGiovanni Gherdovich <ggherdov@brentaal.inria.fr>
Thu, 7 Oct 2010 12:40:19 +0000 (14:40 +0200)
sface/sfiprocess.py

index ca2c023..bf37de5 100644 (file)
@@ -66,7 +66,6 @@ class SfiProcess(QObject):
             print tmpOut        
         self.output += tmpOut
 
-
     def processStandardError(self):
         print self.process.readAllStandardError()