diff options
| author | Tyler Murphy <tylermurphy534@gmail.com> | 2021-12-25 08:23:19 -0600 |
|---|---|---|
| committer | Tyler Murphy <tylermurphy534@gmail.com> | 2021-12-25 08:23:19 -0600 |
| commit | d8da188f024aa705ff285dfbf35d8c5e4b917af9 (patch) | |
| tree | 020429cfc6fde83978303a62aeb68c6ee882c59c /pom.xml | |
| parent | Pre merge (diff) | |
| download | kenshinshideandseek-d8da188f024aa705ff285dfbf35d8c5e4b917af9.tar.gz kenshinshideandseek-d8da188f024aa705ff285dfbf35d8c5e4b917af9.tar.bz2 kenshinshideandseek-d8da188f024aa705ff285dfbf35d8c5e4b917af9.zip | |
Rebase pom.xml
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> |