root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove Conflict Markers

This commit is contained in:
Josh Cummings 2025-05-22 12:29:05 -06:00
parent 97923ebfaf
commit 47338f7e56
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gradle.properties
View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
<<<<<<< HEAD
springBootVersion=4.0.0-SNAPSHOT springBootVersion=4.0.0-SNAPSHOT
version=7.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 samplesBranch=main
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true org.gradle.parallel=true