patches: fix leftover conflict markers in patch 0002

patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch

@@ -1,4 +1,4 @@
-From fed3a06865d403db5d25074e7473c4d7c360f917 Mon Sep 17 00:00:00 2001
+From fb4d1411fcc4a18cefae80dbed856fda8fe8c85e Mon Sep 17 00:00:00 2001
 From: Martin Sukany <martin@sukany.cz>
 Date: Sat, 28 Feb 2026 16:01:29 +0100
 Subject: [PATCH 8/8] ns: announce child frame completion candidates for
@@ -109,7 +109,7 @@ index 2102fb9..dd98d56 100644
  @end
  
 diff --git a/src/nsterm.m b/src/nsterm.m
-index 7ce683d..8a1316a 100644
+index a3104d0..6e8a226 100644
 --- a/src/nsterm.m
 +++ b/src/nsterm.m
 @@ -7398,6 +7398,112 @@ visual line index for Zoom (skip whitespace-only lines
@@ -268,7 +268,7 @@ index 7ce683d..8a1316a 100644
        cachedTextStart = start;
  
        if (visibleRuns)
-@@ -9171,6 +9286,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
+@@ -9154,6 +9269,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
    ptrdiff_t currentOverlayStart = 0;
    ptrdiff_t currentOverlayEnd = 0;
  
@@ -276,7 +276,7 @@ index 7ce683d..8a1316a 100644
    specpdl_ref count2 = SPECPDL_INDEX ();
    record_unwind_current_buffer ();
    if (b != current_buffer)
-@@ -9329,6 +9445,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
+@@ -9312,6 +9428,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
        self.cachedCompletionOverlayEnd = 0;
        self.cachedCompletionPoint = 0;
      }
@@ -284,7 +284,7 @@ index 7ce683d..8a1316a 100644
  }
  
  /* ---- Notification dispatch (main entry point) ---- */
-@@ -9925,6 +10042,10 @@ - (void)dealloc
+@@ -9908,6 +10025,10 @@ - (void)dealloc
  #endif
  
    [accessibilityElements release];
@@ -295,7 +295,7 @@ index 7ce683d..8a1316a 100644
    [[self menu] release];
    [super dealloc];
  }
-@@ -11374,6 +11495,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
+@@ -11357,6 +11478,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
  
    windowClosing = NO;
    processingCompose = NO;
@@ -305,7 +305,7 @@ index 7ce683d..8a1316a 100644
    scrollbarsNeedingUpdate = 0;
    fs_state = FULLSCREEN_NONE;
    fs_before_fs = next_maximized = -1;
-@@ -12682,6 +12806,80 @@ - (id)accessibilityFocusedUIElement
+@@ -12665,6 +12789,80 @@ - (id)accessibilityFocusedUIElement
     The existing elements carry cached state (modiff, point) from the
     previous redisplay cycle.  Rebuilding first would create fresh
     elements with current values, making change detection impossible.  */
@@ -386,7 +386,7 @@ index 7ce683d..8a1316a 100644
  - (void)postAccessibilityUpdates
  {
    NSTRACE ("[EmacsView postAccessibilityUpdates]");
-@@ -12692,11 +12890,59 @@ - (void)postAccessibilityUpdates
+@@ -12675,11 +12873,59 @@ - (void)postAccessibilityUpdates
  
    /* Re-entrance guard: VoiceOver callbacks during notification posting
       can trigger redisplay, which calls ns_update_end, which calls us