SP-1066: Fix readme and changelog

bitpay · Sep 9, 2024 · eed838b · eed838b
1 parent 3d463b6
commit eed838b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Fixed a bug when the IPN/webhook is received with "complete" status
 * Add Unit & End2End tests
 
+# 5.5.1
+* Fixed issue with payment logo url
+
 # 5.5.0
 * Tested compatibility with WordPress 6.5.2
 

diff --git a/readme.txt b/readme.txt
@@ -2,19 +2,12 @@
 Contributors: bitpay
 Tags: bitcoin, ether, ripple, bitcoin cash, ERC20, payments, bitpay, cryptocurrency, payment gateway
 Requires at least: 6.0
-<<<<<<< HEAD
 Tested up to: 6.4.2
 WC requires at least: 8.0.0
 WC tested up to: 8.5.2
 Requires PHP: 8.1
 Recommended PHP: 8.3
 Stable tag: 6.0.0
-=======
-Tested up to: 6.5.2
-Requires PHP: 8.0
-Recommended PHP: 8.0
-Stable tag: 5.5.1
->>>>>>> origin/master
 License: MIT License (MIT)
 License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE
 
@@ -124,6 +117,9 @@ You can contact our support team via the following form https://bitpay.com/reque
 * Fixed a bug when the IPN/webhook is received with "complete" status
 * * Add Unit & End2End tests
 
+= 5.5.1 =
+* Fixed issue with payment logo url
+
 = 5.5.0 =
 * Tested compatibility with WordPress 6.5.2