Skip to content
This repository
Browse code

...

  • Loading branch information...
commit d4b03d9fb7ad4d42336b1536c13e8cbc79cf4321 1 parent 76d82fc
yunglin authored August 25, 2010

Showing 1 changed file with 0 additions and 4 deletions. Show diff stats Hide diff stats

  1. 4  pom.xml
4  pom.xml
@@ -2,11 +2,7 @@
2 2
   <modelVersion>4.0.0</modelVersion>
3 3
   <groupId>com.bluetangstudio</groupId>
4 4
   <artifactId>tapestry-jersey</artifactId>
5  
-<<<<<<< HEAD
6  
-  <version>1.0.3</version>
7  
-=======
8 5
   <version>1.0.4-SNAPSHOT</version>
9  
->>>>>>> origin/master
10 6
   <parent>
11 7
     <groupId>org.sonatype.oss</groupId>
12 8
     <artifactId>oss-parent</artifactId>

0 notes on commit d4b03d9

Please sign in to comment.
Something went wrong with that request. Please try again.