Sync

BerndiVader · Jul 10, 2021 · c41fe93 · c41fe93
1 parent 4c91af5
commit c41fe93
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compileOnly  ("org.spigotmc:spigot-1.15.2:+") 
     compileOnly  ("org.spigotmc:spigot-1.14.4:+") 
     compileOnly  ("org.spigotmc:spigot-1.13.2:+") 
-    compileOnly  ("org.spigotmc:spigot-1.12.2:+")
+    compileOnly  ("org.spigotmc:spigot-1.12.2:+") 
     compileOnly  ("com.massivecraft:massivecore:+")
     compileOnly  ("com.massivecraft:factions:+")
     compileOnly  ("com.gmail.filoghost:holographicdisplays:+")

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,3 @@
 #Tue Feb 16 14:18:06 CET 2021
 group=com.gmail.berndivader
-<<<<<<< HEAD
-artver=1.739c-SNAPSHOT
-=======
 artver=1.739-SNAPSHOT
->>>>>>> 45ef248a2002d4837839f5506555fa74bc88e713