From 8b644027a1b57f44525494930d4875ae80c7d24d Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Wed, 5 Oct 2022 11:08:35 -0700
Subject: [PATCH] fix test

---
 .../Source/FlutterTextInputPluginTest.mm      | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
index 0e820afd4bbef..50ac6d2b3c34b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
@@ -406,43 +406,6 @@ - (void)testStandardEditActions {
   XCTAssertEqualObjects(substring, @"bbbbaaaabbbbaaaa");
 }
 
-<<<<<<< HEAD
-=======
-- (void)testDeletingBackward {
-  NSDictionary* config = self.mutableTemplateCopy;
-  [self setClientId:123 configuration:config];
-  NSArray<FlutterTextInputView*>* inputFields = self.installedInputViews;
-  FlutterTextInputView* inputView = inputFields[0];
-
-  [inputView insertText:@"ឹ😀 text 🥰👨‍👩‍👧‍👦🇺🇳ดี "];
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-
-  // Thai vowel is removed.
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀 text 🥰👨‍👩‍👧‍👦🇺🇳ด");
-  [inputView deleteBackward];
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀 text 🥰👨‍👩‍👧‍👦🇺🇳");
-  [inputView deleteBackward];
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀 text 🥰👨‍👩‍👧‍👦");
-  [inputView deleteBackward];
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀 text 🥰");
-  [inputView deleteBackward];
-
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀 text ");
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-  [inputView deleteBackward];
-
-  XCTAssertEqualObjects(inputView.text, @"ឹ😀");
-  [inputView deleteBackward];
-  XCTAssertEqualObjects(inputView.text, @"ឹ");
-  [inputView deleteBackward];
-  XCTAssertEqualObjects(inputView.text, @"");
-}
-
 // This tests the workaround to fix an iOS 16 bug
 // See: https://github.com/flutter/flutter/issues/111494
 - (void)testSystemOnlyAddingPartialComposedCharacter {
@@ -502,7 +465,6 @@ - (void)testCachedComposedCharacterClearedAtKeyboardInteraction {
   XCTAssertEqualObjects(inputView.text, finalText);
 }
 
->>>>>>> ba1c87a07c (Workaround iOS text input crash for emoji+Korean text (#36295))
 - (void)testPastingNonTextDisallowed {
   NSDictionary* config = self.mutableTemplateCopy;
   [self setClientId:123 configuration:config];