From 69ac97d709a69afd4b0159a46a3fd36f77339387 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Wed, 20 Apr 2016 12:37:48 +0200
Subject: [PATCH] Update run.py

resolve conflict.
---
 test/regression/run.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/regression/run.py b/test/regression/run.py
index 4ecd1832e..a9850f076 100755
--- 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()