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