Permalink
Browse files

Merge remote branch 'origin/master'

Conflicts:
	pom.xml
  • Loading branch information...
yunglin committed Aug 25, 2010
2 parents 2e6c72e + f0b0acf commit 76d82fcddaa11a9b714f88a8665eec3a0b6aa50a
Showing with 4 additions and 0 deletions.
  1. +4 −0 pom.xml
View
@@ -2,7 +2,11 @@
<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 76d82fc

Please sign in to comment.