lib/active_merchant/version.rb.orig in smulube-activemerchant-1.7.0.3 vs lib/active_merchant/version.rb.orig in smulube-activemerchant-1.7.1
- old
+ new
@@ -1,7 +1,7 @@
module ActiveMerchant
<<<<<<< HEAD
- VERSION = "1.5.1.5"
+ VERSION = "1.7.0.3"
=======
- VERSION = "1.7.0"
->>>>>>> 35e7918d222ad541a7e4a0c49627acd6d65a532c
+ VERSION = "1.7.1"
+>>>>>>> 94b61ae527c8ce0c9b2e4c12417d8c2014ec62eb
end