fixup bad hand merge

--HG-- extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed
2007-08-13 23:45:07 -04:00 · 2007-08-13 23:45:07 -04:00 · 546fbfb47c
parent 27ddf0b40e
commit 546fbfb47c
1 changed files with 0 additions and 1 deletions
--- 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)