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

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