diff options
Diffstat (limited to 'test/prism/ruby/parser_test.rb')
| -rw-r--r-- | test/prism/ruby/parser_test.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb index 6b72beddc4..e7cd06bf32 100644 --- a/test/prism/ruby/parser_test.rb +++ b/test/prism/ruby/parser_test.rb @@ -92,11 +92,6 @@ module Prism # These files are either failing to parse or failing to translate, so we'll # skip them for now. skip_all = skip_incorrect | [ -<<<<<<< HEAD -======= - "unescaping.txt", - "seattlerb/regexp_esc_C_slash.txt", ->>>>>>> 4edfe9d981 (Further refine string handling in the parser translator) ] # Not sure why these files are failing on JRuby, but skipping them for now. |