Merge pull request #2 from pokemongo-dev-contrib/0.101.1

Add Exeggutor Alola. Will need another update soon
pokemongo-dev-contrib · Jun 7, 2018 · cd055ae · cd055ae
2 parents 9380727 + 7e9b0bc
commit cd055ae
Show file tree

Hide file tree

Showing 6 changed files with 49,638 additions and 833 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.pokebattler</groupId>
     <artifactId>pokemongo-game-master</artifactId>
-    <version>2.23.0</version>
+    <version>2.27.0</version>
     <packaging>jar</packaging>
 
     <name>PokeBattler Fight</name>
@@ -13,7 +13,11 @@
     <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>