pom.xml 1013 B

1234567891011121314151617181920212223242526272829303132
  1. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  2. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  3. <modelVersion>4.0.0</modelVersion>
  4. <groupId>org.example</groupId>
  5. <<<<<<< HEAD
  6. <artifactId>untitled</artifactId>
  7. <packaging>war</packaging>
  8. <version>1.0-SNAPSHOT</version>
  9. <name>untitled Maven Webapp</name>
  10. =======
  11. <artifactId>test4</artifactId>
  12. <packaging>war</packaging>
  13. <version>1.0-SNAPSHOT</version>
  14. <name>test4 Maven Webapp</name>
  15. >>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
  16. <url>http://maven.apache.org</url>
  17. <dependencies>
  18. <dependency>
  19. <groupId>junit</groupId>
  20. <artifactId>junit</artifactId>
  21. <version>3.8.1</version>
  22. <scope>test</scope>
  23. </dependency>
  24. </dependencies>
  25. <build>
  26. <<<<<<< HEAD
  27. <finalName>untitled</finalName>
  28. =======
  29. <finalName>test4</finalName>
  30. >>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
  31. </build>
  32. </project>