summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2013-07-02 15:54:00 -0700
committerMark Wells <mark@freeside.biz>2013-07-02 15:54:00 -0700
commit250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1 (patch)
tree4752fc52e0d39b6a064b200db3599752f8429611
parent977ae07ace47748c3abaf508a09c8e5488989ed7 (diff)
parenta9ea9b31bead46acca268b0a31564fdabbacb96d (diff)
Merge branch 'master' of git.freeside.biz:/home/git/Business-OnlineThirdPartyPayment
Conflicts: Changes OnlineThirdPartyPayment.pm
-rw-r--r--Changes8
-rw-r--r--OnlineThirdPartyPayment.pm2
2 files changed, 6 insertions, 4 deletions
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 = (