2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 08:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct pom file broken by git.

Browse Source
This commit is contained in:
Major-
2014-01-27 00:16:43 +00:00
parent 918b011c71
commit 3b80e399c4
1 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
-35
View File
@@ -2,7 +2,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"> http://maven.apache.org/xsd/maven-4.0.0.xsd">
<<<<<<< HEAD
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.apollo</artifactId> <artifactId>org.apollo</artifactId>
<version>1.0</version> <version>1.0</version>
@@ -46,37 +45,3 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
=======
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apollo</artifactId>
<version>1.0.0-SNAPSHOT</version>
<groupId>apollo</groupId>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
</build>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>1.7.10</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.0.15.Final</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
>>>>>>> 86a477d2133d3cab6d6d9983e1bb939db088db39