Fixed merge conflicts

unicode-org · Jun 26, 2024 · 066326e · 066326e
2 parents 7e161a6 + 125e877
commit 066326e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyAliases.txt b/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyAliases.txt
@@ -175,6 +175,7 @@ cjkZhuangNumeric         ; kZhuangNumeric
 # 16.0
 cjkFanqie                ; kFanqie
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 kTGT_MergedSrc           ; kTGT_MergedSrc
 kRSTUnicode              ; kRSTUnicode
@@ -188,3 +189,6 @@ kEH_UniK                 ; kEH_UniK
 =======
 cjkZhuang                ; kZhuang
 >>>>>>> 2f297052 (Initial checkin for UcdXML)
+=======
+cjkZhuang                ; kZhuang
+>>>>>>> 125e87784bd7b0289068218266b551ab8762292a