From: Mark Wells <mark@freeside.biz>
Date: Tue, 2 Jul 2013 22:54:00 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/Business-OnlineThirdPartyPayment
X-Git-Url: http://git.freeside.biz/gitweb/?p=Business-OnlineThirdPartyPayment.git;a=commitdiff_plain;h=250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1;hp=977ae07ace47748c3abaf508a09c8e5488989ed7

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

Conflicts:
	Changes
	OnlineThirdPartyPayment.pm
---

diff --git a/Changes b/Changes
index b8826bf..39befca 100644
--- 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
 
diff --git a/OnlineThirdPartyPayment.pm b/OnlineThirdPartyPayment.pm
index 8ada8d5..6d6e33e 100644
--- a/OnlineThirdPartyPayment.pm
+++ b/OnlineThirdPartyPayment.pm
@@ -7,7 +7,7 @@ use base qw(Business::OnlinePayment);
 
 require 5.005;
 
-$VERSION = 0.10;
+$VERSION = '0.10';
 $VERSION = eval $VERSION; # modperlstyle: convert the string into a number
 
 my %fields = (