Bugs fixed and testexample improved

retrooper · Apr 20, 2020 · 8aa8a99 · 8aa8a99
2 parents 2916e57 + 6d0a4c0
commit 8aa8a99
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
             <version>4.1.42.Final</version>
+<<<<<<< HEAD
             <scope>compile</scope>
+=======
+>>>>>>> 6d0a4c07c64f35deb6f9780f3194f7577115d66a
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>