fix merge conflicts

diff --cc sface/sfiprocess.py
index ca2c023,8e5e371..bf37de5
--- 1/sface/sfiprocess.py
--- 2/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@@ -55,18 -41,10 +55,17 @@@ class SfiProcess(QObject)
          return self.process.state() != QProcess.NotRunning
  
      def processStandardOutput(self):
 -        output = self.process.readAllStandardOutput()
 +        # NOTE: The signal readyReadStandardOutput is emitted when
 +        # the process has made new data available through its standard output channel.
 +        # But the process is not necessarily finished.
 +        # It's cool to have this method wo we print the stdOut live,
 +        # but we must be carefull with self.output, used by xmlTracker too.
 +        print "SETTING SELF.OUTPUT"
 +        tmpOut = self.process.readAllStandardOutput()
          if config.debug:
 -            print output
 +            print tmpOut        
 +        self.output += tmpOut
  
- 
      def processStandardError(self):
          print self.process.readAllStandardError()