Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-30 16:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Conflict Markers

Browse Source
This commit is contained in:
Josh Cummings 2025-05-22 12:31:40 -06:00
parent 4bf03bde5b
commit d2d2b97b7d
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -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