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

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

diff --git a/gradle.properties b/gradle.properties
index ebaaff90bc..50aca0de35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,11 +14,7 @@
 # limitations under the License.
 #
 springBootVersion=3.3.3
-<<<<<<< HEAD
 version=6.5.1-SNAPSHOT
-=======
-version=6.4.7-SNAPSHOT
->>>>>>> origin/6.4.x
 samplesBranch=main
 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true