From f2841ee60c917db39eb8581ff7f2d2a8ea4d98c7 Mon Sep 17 00:00:00 2001
From: mazevedo <mazevedo@wikimedia.org>
Date: Mon, 8 Jan 2024 12:57:19 -0300
Subject: [PATCH] Fix remaining conflict

---
 .../WKSourceEditorTextFrameworkMediatorTests.swift          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Components/Tests/ComponentsTests/WKSourceEditorTextFrameworkMediatorTests.swift b/Components/Tests/ComponentsTests/WKSourceEditorTextFrameworkMediatorTests.swift
index 18db216f3fe..5aa38f420ed 100644
--- a/Components/Tests/ComponentsTests/WKSourceEditorTextFrameworkMediatorTests.swift
+++ b/Components/Tests/ComponentsTests/WKSourceEditorTextFrameworkMediatorTests.swift
@@ -61,7 +61,6 @@ final class WKSourceEditorTextFrameworkMediatorTests: XCTestCase {
         XCTAssertFalse(selectionStates9.isItalics)
     }
     
-<<<<<<< HEAD
     func testSelectionSpanningNonFormattedState1() throws {
         let text = "Testing '''bold with {{template}}''' selection that spans nonbold."
         mediator.textView.attributedText = NSAttributedString(string: text)
@@ -80,7 +79,7 @@ final class WKSourceEditorTextFrameworkMediatorTests: XCTestCase {
         let selectionStates1 = mediator.selectionState(selectedDocumentRange: NSRange(location: 10, length: 21))
         XCTAssertFalse(selectionStates1.isBold)
         XCTAssertTrue(selectionStates1.isHorizontalTemplate)
-=======
+    }
     func testClosingBoldSelectionStateCursor() throws {
         let text = "One '''Two''' Three"
         mediator.textView.attributedText = NSAttributedString(string: text)
@@ -95,7 +94,6 @@ final class WKSourceEditorTextFrameworkMediatorTests: XCTestCase {
 
         let selectionStates = mediator.selectionState(selectedDocumentRange: NSRange(location: 9, length: 0))
         XCTAssertTrue(selectionStates.isItalics)
->>>>>>> a08b4c44f206d70dc05551b00fbede5dc6dd8faa
     }
     
     func testHorizontalTemplateButtonSelectionStateCursor() throws {
@@ -167,7 +165,7 @@ final class WKSourceEditorTextFrameworkMediatorTests: XCTestCase {
         let selectionStates = mediator.selectionState(selectedDocumentRange: NSRange(location: 26, length: 77))
         XCTAssertTrue(selectionStates.isHorizontalTemplate)
     }
-    
+
     func testStrikethroughSelectionState() throws {
         let text = "Testing <s>Strikethrough</s> Testing."
         mediator.textView.attributedText = NSAttributedString(string: text)