diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,10 @@ -<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> +<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> <groupId>net.tylermurphy</groupId> +<<<<<<< HEAD <artifactId>KenshinsHideAndSeek</artifactId> +======= + <artifactId>HideAndSeek</artifactId> +>>>>>>> 06b31297d3d83a0c7b76230be1b089bdfd8e4afa <version>1.3.3</version> <name>Hide and Seek Plugin</name> <build> @@ -46,4 +50,4 @@ <scope>compile</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> |