smack down! (#7)

pokemongo-dev-contrib · Jun 15, 2018 · 25e1344 · 25e1344
1 parent cd055ae
commit 25e1344
Show file tree

Hide file tree

Showing 6 changed files with 50,232 additions and 1,497 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,11 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-<<<<<<< HEAD
         <gamemaster.version>2.27.0</gamemaster.version>
-=======
-        <gamemaster.version>2.26.1</gamemaster.version>
->>>>>>> origin/master
     </properties>
 	<repositories>
 	    <repository>