summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-08-13 23:45:07 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-08-13 23:45:07 -0400
commit546fbfb47cc1e79ceb91a26fb0d2c27973e2d92b (patch)
treebb9e747857b32f7f2360dce2ae181c53556b03f8 /util
parent27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9 (diff)
downloadgem5-546fbfb47cc1e79ceb91a26fb0d2c27973e2d92b.tar.xz
fixup bad hand merge
--HG-- extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed
Diffstat (limited to 'util')
-rwxr-xr-xutil/regress1
1 files changed, 0 insertions, 1 deletions
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)