3 months ago · d2d2b97b7d
--- 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