From 47338f7e567560b57d073e41ae771f8654e24294 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 22 May 2025 12:29:05 -0600
Subject: [PATCH] Remove Conflict Markers

---
 gradle.properties | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2402e4c544..19a07278b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-<<<<<<< HEAD
 springBootVersion=4.0.0-SNAPSHOT
 version=7.0.0-SNAPSHOT
-=======
-springBootVersion=3.3.3
-<<<<<<< HEAD
-version=6.5.1-SNAPSHOT
-=======
-version=6.4.7-SNAPSHOT
->>>>>>> origin/6.4.x
->>>>>>> 6.5.x
 samplesBranch=main
 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true