From 85e218f62feb1bdd468bb20d6179349b96a465b7 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 15 Jul 2010 12:51:45 -0500
Subject: [PATCH] remove bad merge marks

---
 t/Shop/Pay.t | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/t/Shop/Pay.t b/t/Shop/Pay.t
index 420ea995d..de92bf077 100644
--- a/t/Shop/Pay.t
+++ b/t/Shop/Pay.t
@@ -217,13 +217,3 @@ cmp_bag(
 #######################################################################
 
 done_testing();
-<<<<<<< HEAD
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    defined $newDriver and $newDriver->delete;
-    defined $newDriver and $anotherDriver->delete;
-}
-=======
->>>>>>> upstream/WebGUI8