Update paper (LeavesMC#247)

Lumine1909 · Jul 7, 2024 · 19646f0 · 19646f0
1 parent c2980f7
commit 19646f0
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,7 @@ org.gradle.jvmargs=-Xmx2G
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 paperRef=8d91b859cbeb64ecbc3916249fce26a085b320aa
 =======
 paperRef=dd49fba8c534d48c3693a751075ecb5836a9d458
@@ -16,10 +17,13 @@ paperRef=dd49fba8c534d48c3693a751075ecb5836a9d458
 paperRef=1f5db504244fe6563ab32cee646dad0c53360e01
 >>>>>>> 0596dee (Update Paper)
 =======
+=======
+>>>>>>> 1d15028 (Update paper (#247))
 paperRef=1f5db504244fe6563ab32cee646dad0c53360e01
 =======
 paperRef=be8ac7acc3ca286aac62c836db03d69b57f7b8fe
 >>>>>>> 4a69af3 (1.21 (#238))
+<<<<<<< HEAD
 >>>>>>> cb54554 (1.21 (#238))
 preVersion=true
 updatingMinecraft=true
@@ -31,3 +35,10 @@ paperRef=76c2f16f577d2e5515482a8dcd3d97aeeec20e1e
 preVersion=true
 updatingMinecraft=true
 >>>>>>> 3cc9cf9 (start!)
+=======
+=======
+paperRef=8d91b859cbeb64ecbc3916249fce26a085b320aa
+>>>>>>> 76eb988 (Update paper (#247))
+preVersion=true
+updatingMinecraft=true
+>>>>>>> 1d15028 (Update paper (#247))