From 546fbfb47cc1e79ceb91a26fb0d2c27973e2d92b Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 13 Aug 2007 23:45:07 -0400
Subject: [PATCH] fixup bad hand merge

--HG--
extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed
---
 util/regress | 1 -
 1 file changed, 1 deletion(-)

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)