Fix merge conflict that got committed.

headius · headius · commit 83021d8dffda · 2018-01-29T15:50:15.000-06:00
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"
