Commit b6a68c9f authored by Sabine's avatar Sabine
Browse files

Merge branch...

Merge branch 'refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION' of https://github.com/keymanapp/keyman into refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION

# Conflicts:
#	common/test/keyboards/invalid/source/CERR_1234_sil_yoruba8_WrongCopyrightChar_and_WrongErrNrInName.kmn
#	common/test/keyboards/invalid/source/CERR_40133_balochi_phonetic_WrongErrNrInName.kmn
#	common/test/keyboards/invalid/source/sil_yoruba8_WrongCopyrightChar_AndMissingErNrInName.kmn
#	common/test/keyboards/invalid/source/xCERR_4034_balochi_phonetic_WrongNamingConvention.kmn
chore(developer): solve conflicts
parents f74e6968 156facaa
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment