From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Jul 2013 00:21:54 +0000 (-0700)
Subject: remove merge cruft
X-Git-Url: http://git.freeside.biz/gitweb/?p=Business-OnlineThirdPartyPayment.git;a=commitdiff_plain;h=b79b9af7c5e00611e45716becebef94aeb382a48

remove merge cruft
---

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