Merge branch 'jruby-1_7'

Conflicts: maven/jruby-complete/src/it/integrity/pom.xml maven/jruby-complete/src/it/integrity/verify.bsh
jruby · Aug 10, 2015 · e5324c4 · e5324c4
2 parents ea5b858 + c60c87a
commit e5324c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -57,4 +57,4 @@ File file = new File(basedir, "bin/.jrubydir");
 if ( !file.exists() )
 {
     throw new RuntimeException( "file '" + file + "' does not exists" );
-}
+}