From 82fdc20d77c6c6e8bc49b829a4a6dd416956d6d7 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Sat, 25 Dec 2021 08:24:25 -0600
Subject: [PATCH] Rebase pom

---
 pom.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d49f1f..de10b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
     <groupId>net.tylermurphy</groupId>
-<<<<<<< HEAD
-    <artifactId>KenshinsHideAndSeek</artifactId>
-=======
     <artifactId>HideAndSeek</artifactId>
->>>>>>> 06b31297d3d83a0c7b76230be1b089bdfd8e4afa
     <version>1.3.3</version>
     <name>Hide and Seek Plugin</name>
     <build>
@@ -43,11 +39,5 @@
             <artifactId>ProtocolLib</artifactId>
             <version>4.7.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file