diff options
| author | Tyler Murphy <tylermurphy534@gmail.com> | 2021-12-25 08:24:25 -0600 |
|---|---|---|
| committer | Tyler Murphy <tylermurphy534@gmail.com> | 2021-12-25 08:24:25 -0600 |
| commit | 82fdc20d77c6c6e8bc49b829a4a6dd416956d6d7 (patch) | |
| tree | 7e6f6169ea5889d2e5d721cdb4be34165b48baaf /pom.xml | |
| parent | Rebase pom.xml (diff) | |
| download | kenshinshideandseek-82fdc20d77c6c6e8bc49b829a4a6dd416956d6d7.tar.gz kenshinshideandseek-82fdc20d77c6c6e8bc49b829a4a6dd416956d6d7.tar.bz2 kenshinshideandseek-82fdc20d77c6c6e8bc49b829a4a6dd416956d6d7.zip | |
Rebase pom
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -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 |