Remove merge poop from release file

headius · headius · commit 82fe3a9ad0ea · 2026-03-03T19:06:59.000-06:00
diff --git a/bin/.jruby.release b/bin/.jruby.release
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 JRUBY_VERSION=10.1.0.0-SNAPSHOT
-=======
-JRUBY_VERSION=10.1.0.0-SNAPSHOT
->>>>>>> origin/jruby-10.0
 JRUBY_MAIN=org.jruby.main.Main
 JRUBY_MINIMUM_JAVA_VERSION=21
