diff --git a/gradle.properties b/gradle.properties index 7349be5..a43e40d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,3 @@ -<<<<<<< HEAD -version_major=2 -version_minor=4 -version_rev=4 - -version_forestry=4.2.+ -version_botania=r1.8-248 -version_baubles=1.0.1.10 -version_thaumcraft=4.2.3.5 - -version_mc=1.7.10 -version_forge=10.13.4.1614-1.7.10 -======= version_major=2 version_minor=5 version_rev=2 @@ -22,4 +9,3 @@ version_thaumcraft=4.2.3.5 version_mc=1.7.10 version_forge=10.13.4.1614-1.7.10 ->>>>>>> TataTawa/1.7.10-krypt