1
0
mirror of synced 2026-05-22 21:33:16 +00:00

Merge branch '6.5.x'

This commit is contained in:
Rob Winch
2025-05-20 16:04:42 -05:00
2 changed files with 15 additions and 73 deletions
+9
View File
@@ -13,8 +13,17 @@
# 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