pom.xml.rej 262 B

123456789
  1. diff a/pom.xml b/pom.xml (rejected hunks)
  2. @@ -2,6 +2,7 @@
  3. <modelVersion>4.0.0</modelVersion>
  4. <groupId>com.bukkitbackup</groupId>
  5. <artifactId>Backup</artifactId>
  6. ++<<<<<<< HEAD
  7. + <version>2.0</version>
  8. +=======
  9. <version>2.5</version>