remove TangutSources conflict markers

unicode-org · Dec 17, 2024 · e999c3e · e999c3e
1 parent d558b32
commit e999c3e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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