From 3d463b634171ed395bf4d1c7bdae8cb6672d5e25 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 9 Sep 2024 12:33:00 -0400 Subject: [PATCH] SP-1066: Fix final conflicts --- BitPayLib/class-wcgatewaybitpay.php | 4 ---- index.php | 4 ---- 2 files changed, 8 deletions(-) diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php index 87294c1..f9c5fd5 100644 --- 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:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce */ diff --git a/index.php b/index.php index 332749e..8203945 100644 --- 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:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce */