From 7002d44c103fa2dfc4f4cd48ef1573fcd3a0dd73 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Fri, 25 Aug 2023 09:00:04 -0400
Subject: [PATCH] Fix merge conflict in lib/yarp/lex_compat.rb

---
 lib/yarp/lex_compat.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/yarp/lex_compat.rb b/lib/yarp/lex_compat.rb
index 66aa116493..252e6bd397 100644
--- a/lib/yarp/lex_compat.rb
+++ b/lib/yarp/lex_compat.rb
@@ -593,12 +593,7 @@ module YARP
         if bom && lineno == 1
           column -= 3
 
-<<<<<<< HEAD
-=begin
-          if index == 0 && column == 0
-=======
           if index == 0 && column == 0 && !bom_flushed
->>>>>>> 7710cee2480 (Fix up lex compat on Ruby HEAD)
             flushed =
               case token.type
               when :BACK_REFERENCE, :INSTANCE_VARIABLE, :CLASS_VARIABLE,
@@ -618,7 +613,6 @@ module YARP
               value.prepend(String.new("\xEF\xBB\xBF", encoding: value.encoding))
             end
           end
-=end
         end
 
         event = RIPPER.fetch(token.type)