Permalink
Browse files

...

  • Loading branch information...
1 parent 76d82fc commit d4b03d9fb7ad4d42336b1536c13e8cbc79cf4321 @yunglin committed Aug 25, 2010
Showing with 0 additions and 4 deletions.
  1. +0 −4 pom.xml
View
@@ -2,11 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.bluetangstudio</groupId>
<artifactId>tapestry-jersey</artifactId>
-<<<<<<< HEAD
- <version>1.0.3</version>
-=======
<version>1.0.4-SNAPSHOT</version>
->>>>>>> origin/master
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>

0 comments on commit d4b03d9

Please sign in to comment.