X-Git-Url: http://git.freeside.biz/gitweb/?p=Business-OnlineThirdPartyPayment.git;a=blobdiff_plain;f=Changes;h=39befcaa8de9191aaae16b0d750053f3173c7bcb;hp=22f69d6d75ebb9840e2dba1c3bdf93eae859fc9a;hb=250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1;hpb=a9ea9b31bead46acca268b0a31564fdabbacb96d

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