remove merge cruft

diff --git a/Changes b/Changes
index 39befca..22f69d6 100644 (file)
--- 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