Merge branch 'master' of git.freeside.biz:/home/git/Business-OnlineThirdPartyPayment

[Business-OnlineThirdPartyPayment.git] / Changes

diff --git a/Changes b/Changes
index b8826bf..39befca 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,9 @@
 Revision history for Perl extension Business::OnlineThirdPartyPayment.
 
-0.10  unrelesed
-        - complete rewrite
-0.01  unreleased
+0.10 unreleased
+        - rewrite by mark
+
+3.00_09 unreleased
+>>>>>>> a9ea9b31bead46acca268b0a31564fdabbacb96d
        - original version; created by jeff