push 2.6 tag

Author: ryanhungate

CHANGELOG.txt

@@ -1,14 +1,11 @@
 == Changelog ==
-<<<<<<< HEAD
 = 2.6 =
 * adds support for selectively syncing subscribers only 
 * updates to action scheduler dependency 
-=======
 = 2.5.4 =
 * enhanced api error parsing
 * adds site transient for tracking cart
 * tested for woocommerce v5.8
->>>>>>> origin/feature/action-scheduler-upgrade
 = 2.5.3 =
 * remove order_total and total_spent from customer submission
 = 2.5.2 =

README.txt

@@ -4,7 +4,7 @@ Tags: ecommerce,email,workflows,mailchimp
 Donate link: https://mailchimp.com
 Requires at least: 4.9
 Tested up to: 5.9
-Stable tag: 2.5.3
+Stable tag: 2.6
 Requires PHP: 7.0
 WC requires at least: 3.5
 WC tested up to: 6.2