summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
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)