From b79b9af7c5e00611e45716becebef94aeb382a48 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 2 Jul 2013 17:21:54 -0700
Subject: [PATCH] remove merge cruft

---
 Changes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Changes b/Changes
index 39befca..22f69d6 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,5 @@ Revision history for Perl extension Business::OnlineThirdPartyPayment.
         - rewrite by mark
 
 3.00_09 unreleased
->>>>>>> a9ea9b31bead46acca268b0a31564fdabbacb96d
 	- original version; created by jeff
 
-- 
2.11.0