From c658b2368f138ffb720d99c0721100c4b43e25ab Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Tue, 17 Oct 2023 11:56:01 -0400
Subject: [PATCH] fix: merge conflicts

---
 give.php   | 4 ----
 readme.txt | 8 +++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/give.php b/give.php
index 871644ff35..5f57122e23 100644
--- a/give.php
+++ b/give.php
@@ -391,11 +391,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-<<<<<<<<< Temporary merge branch 1
-            define('GIVE_VERSION', '2.33.5');
-=========
             define('GIVE_VERSION', '3.0.0');
->>>>>>>>> Temporary merge branch 2
         }
 
         // Plugin Root File.
diff --git a/readme.txt b/readme.txt
index e0dcf844d9..93a3ee88ea 100644
--- a/readme.txt
+++ b/readme.txt
@@ -262,16 +262,14 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 10. Use almost any payment gateway integration with GiveWP through our add-ons or by creating your own add-on.
 
 == Changelog ==
-<<<<<<<<< Temporary merge branch 1
-= 2.33.5: October 10th, 2023 =
-* Fix: Prevent failed donations in sites that use proxy services like Cloudflare and gateways that require the original IP address
-
 = 3.0.0: October 16th, 2023 =
 * New: Try out the all new Visual Donation Form Builder!
 * New: All new form infrastructure for forms using the Form Builder!
 * New: Stripe Payment Element gateway for Stripe with support for many types of payment methods
 * New: Existing forms can be migrated and upgrade to use the Form Builder
->>>>>>>>> Temporary merge branch 2
+
+= 2.33.5: October 10th, 2023 =
+* Fix: Prevent failed donations in sites that use proxy services like Cloudflare and gateways that require the original IP address
 
 = 2.33.3: September 29th, 2023 =
 * Fix: Multi-site installations no longer produce an error on subsites.