Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove TangutSources conflict markers #992

Merged
merged 1 commit into from
Dec 17, 2024
Merged

remove TangutSources conflict markers #992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions unicodetools/data/ucd/dev/TangutSources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading