From 39fd292beb195fa31d8e0271b1a594bb78d90e7e Mon Sep 17 00:00:00 2001
From: Robin Leroy <egg.robin.leroy@gmail.com>
Date: Tue, 24 Oct 2023 23:01:52 +0200
Subject: [PATCH] Ignore conflict markers in ScriptExtensions

---
 .../src/main/java/org/unicode/jsp/FileUtilities.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java b/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
index 366627e50..a0c4d2bb0 100644
--- a/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
+++ b/unicodetools/src/main/java/org/unicode/jsp/FileUtilities.java
@@ -76,6 +76,11 @@ public SemiFileReader process(BufferedReader in, String fileName) {
                     if (line == null) {
                         break;
                     }
+                    if (line.startsWith("<<<<<<<")
+                            || line.startsWith("=======")
+                            || line.startsWith(">>>>>>>")) {
+                        continue;
+                    }
                     final int comment = line.indexOf("#");
                     if (comment >= 0) {
                         processComment(line, comment);