From: Ali Saidi <saidi@eecs.umich.edu>
Date: Tue, 14 Aug 2007 03:45:07 +0000 (-0400)
Subject: fixup bad hand merge
X-Git-Tag: m5_2.0_beta4~157^2~11
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=546fbfb47cc1e79ceb91a26fb0d2c27973e2d92b;p=gem5.git

fixup bad hand merge

--HG--
extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed
---

diff --git a/util/regress b/util/regress
index 84f925ba4..8ff07c453 100755
--- 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)