patches: fix leftover conflict markers in patch 0002

This commit is contained in:
2026-03-01 09:17:45 +01:00
parent 0c13f5d6a3
commit e0343db56c
7 changed files with 47 additions and 88 deletions

View File

@@ -1,4 +1,4 @@
From 78b8d79ec5505165d6864cc65c7b3703a57e441c Mon Sep 17 00:00:00 2001
From e73e311a95d86d6e88a78185aab42ca65b65e066 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 4/8] ns: add interactive span elements for Tab navigation
@@ -17,10 +17,10 @@ Tested on macOS 14. Verified: Tab-cycling through org-mode links,
1 file changed, 286 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index 239666d..94a4602 100644
index fee3e49..8c26e27 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9287,6 +9287,292 @@ - (NSRect)accessibilityFrame
@@ -9282,6 +9282,292 @@ - (NSRect)accessibilityFrame
@end