Upgrade to version 1.9.8.2

README.txt

@@ -152,8 +152,6 @@ You can read this tutorial explaining how to do it <a href="https://ultimatesmsn
 == Screenshots ==
 
 == Changelog ==
-<<<<<<< Updated upstream
-=======
 <h4>1.9.8.2 - 19 November 2022</h4>
 <ul>
 <li>Comply with WordPress.org guidelines.</li>
@@ -162,7 +160,6 @@ You can read this tutorial explaining how to do it <a href="https://ultimatesmsn
 <ul>
 <li>Fix fatal errors.</li>
 </ul>
->>>>>>> Stashed changes
 <h4>1.9.8 - 19 November 2022</h4>
 <ul>
 <li>Fix style issues with theme Konte</li>

abstract/constants.php

@@ -2,11 +2,7 @@
 /**
  * All the constants related to the plugin are defined here.
  */
-<<<<<<< Updated upstream
-define( 'WOO_USN_VERSION', '1.9.8' );
-=======
 define( 'WOO_USN_VERSION', '1.9.8.2' );
->>>>>>> Stashed changes
 define( 'WOO_USN_PATH', plugin_dir_path( __FILE__ ) );
 define( 'WOO_USN_URL', plugins_url( '/', __FILE__ ) );
 define( 'WOO_USN_PLUGIN_ID', '6855' );

woo-usn.php

@@ -3,13 +3,8 @@
  *
  * Plugin Name:       Ultimate SMS Notifications for WooCommerce
  * Plugin URI:        https://ultimatesmsnotifications.com?utm_source=customer_websites&utm_medium=plugin_page
-<<<<<<< Updated upstream
- * Description:       Run endless SMS & WhatsApp Notifications using WooCommerce.
- * Version:           1.9.8
-=======
  * Description:       Send orders notifications and more on mobile using WooCommerce.
- * Version:           1.9.8.1
->>>>>>> Stashed changes
+ * Version:           1.9.8.2
  * Author:            HomeScript
  * Author URI:        https://ultimatesmsnotifications.com?utm_source=customer_websites&utm_medium=plugin_page
  * License:           GPL-2.0+