From 40d6447837c098f2fb06e366ada09eb1248dfd0b Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Tue, 17 Dec 2024 13:43:54 -0800 Subject: [PATCH] remove TangutSources conflict markers --- unicodetools/data/ucd/dev/TangutSources.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/unicodetools/data/ucd/dev/TangutSources.txt b/unicodetools/data/ucd/dev/TangutSources.txt index 6069d7b6e..79a603347 100644 --- a/unicodetools/data/ucd/dev/TangutSources.txt +++ b/unicodetools/data/ucd/dev/TangutSources.txt @@ -12405,12 +12405,9 @@ U+18D1B kTGT_MergedSrc N5217-27 U+18D1B kRSTUnicode 36.7 U+18D1C kTGT_MergedSrc N5217-28 U+18D1C kRSTUnicode 141.9 -<<<<<<< HEAD U+18D1D kTGT_MergedSrc H2021-309801 U+18D1D kRSTUnicode 106.13 U+18D1E kTGT_MergedSrc H2021-834001 U+18D1E kRSTUnicode 579.14 -======= ->>>>>>> la-vache/main # EOF