Skip to content

Commit e999c3e

Browse files
committed
remove TangutSources conflict markers
1 parent d558b32 commit e999c3e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

unicodetools/data/ucd/dev/TangutSources.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12405,12 +12405,9 @@ U+18D1B kTGT_MergedSrc N5217-27
1240512405
U+18D1B kRSTUnicode 36.7
1240612406
U+18D1C kTGT_MergedSrc N5217-28
1240712407
U+18D1C kRSTUnicode 141.9
12408-
<<<<<<< HEAD
1240912408
U+18D1D kTGT_MergedSrc H2021-309801
1241012409
U+18D1D kRSTUnicode 106.13
1241112410
U+18D1E kTGT_MergedSrc H2021-834001
1241212411
U+18D1E kRSTUnicode 579.14
12413-
=======
12414-
>>>>>>> la-vache/main
1241512412

1241612413
# EOF

0 commit comments

Comments
 (0)