fixed pom.xml conflicts

dcrec1 · Jan 8, 2009 · 3ba28f5 · 3ba28f5
2 parents a5ab287 + 1104092
commit 3ba28f5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.jruby</groupId>
 			<artifactId>jruby-complete</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 		</dependency>
 	</dependencies>
 	<build>