fixup bad hand merge

--HG--
extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed

diff --git a/util/regress b/util/regress
index 84f925ba4db1058fb47608be720e58c1121f9f2d..8ff07c4533dcdc77dca195d3afa5c72710d9b2a5 100755 (executable)
--- a/util/regress
+++ b/util/regress
@@ -82,7 +82,6 @@ def shellquote(s):
         s = "'%s'" % s
     return s
 
-<<<<<<< /z/saidi/work/m5/util/regress
 if not tests:
     print "No tests specified, just building binaries."
     targets = ['build/%s/m5.%s' % (build, variant)