summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-07-02 17:21:54 -0700
committerIvan Kohler <ivan@freeside.biz>2013-07-02 17:21:54 -0700
commitb79b9af7c5e00611e45716becebef94aeb382a48 (patch)
tree0775246ff22e1a5a4129294ef38be51d7d237a25
parent250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1 (diff)
remove merge cruftHEADmaster
-rw-r--r--Changes1
1 files changed, 0 insertions, 1 deletions
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