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