SP-1066: Fix final conflicts

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

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
@@ -8,11 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
-<<<<<<< HEAD
  * Version: 6.0.0
-=======
- * Version: 5.5.1
->>>>>>> origin/master
  * Author: BitPay
  * Author URI: mailto:[email protected]?subject=BitPay Checkout for WooCommerce
  */

diff --git a/index.php b/index.php
@@ -3,11 +3,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
-<<<<<<< HEAD
  * Version: 6.0.0
-=======
- * Version: 5.5.1
->>>>>>> origin/master
  * Author: BitPay
  * Author URI: mailto:[email protected]?subject=BitPay Checkout for WooCommerce
  */