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.

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

Ignore conflict markers in ScriptExtensions #583

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

eggrobin
Copy link
Member

It just so happens that #419 is only mostly fixed.

@eggrobin eggrobin requested a review from markusicu October 24, 2023 21:04
Co-authored-by: Markus Scherer <markus.icu@gmail.com>
@eggrobin
Copy link
Member Author

(Note that org.unicode.text.UCD.ScriptExtensions uniquely depends on a parser from the JSPs! The rest of the parsers involved in MakeUnicodeFiles are in more reasonable locations.)

@eggrobin eggrobin merged commit e7a9804 into unicode-org:main Oct 24, 2023
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants