Update run.py

resolve conflict.
2016-04-20 12:37:48 +02:00 · 2016-04-20 12:37:48 +02:00 · 69ac97d709
parent c122bb2def
commit 69ac97d709
1 changed files with 0 additions and 4 deletions
--- a/test/regression/run.py
+++ b/test/regression/run.py
@ -223,11 +223,7 @@ def process_dir(d, outfile_results, zipin, result ):
                "dump",
                fullpath, outfile_actual, "-b", "-s", "-l" ] +\
                pppreset.split()
-<<<<<<< HEAD
            print( "command = " + str( command ) )
-=======
-            print "command = " + command )
->>>>>>> fe60654c1ad4d665e2fed05b257a06815c7c113f
            r = subprocess.call(command, **shellparams)
            outfile_results.flush()