pom.xml errors fixed

retrooper · Apr 20, 2020 · b4c28e5 · b4c28e5
1 parent 8aa8a99
commit b4c28e5
Show file tree

Hide file tree

Showing 2 changed files with 166 additions and 3 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/pom.xml b/pom.xml
@@ -80,10 +80,7 @@
             <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>