Fix merge conflict that got committed.

jruby · Jan 29, 2018 · 83021d8 · 83021d8
1 parent f8ac719
commit 83021d8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/mri/excludes/Rational_Test.rb b/test/mri/excludes/Rational_Test.rb
@@ -1,7 +1,4 @@
 exclude :test_conv, "needs investigation"
 exclude :test_marshal, "needs investigation"
-<<<<<<< HEAD
 exclude :test_power_overflow, "consumes much time and memory on JVM"
-=======
->>>>>>> jruby-9.1
 exclude :test_ratsub, "needs investigation"