Solved merge conflicts

Browse Source

...

This commit is contained in:

JasperAtSchool

2026-05-20 10:42:17 +02:00

parent a18b19da66 0f9ae79d49

commit 9ca375ee2c

247 changed files with 10788 additions and 25817 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

languages/khmer.json

+599 -599

File diff suppressed because it is too large Load Diff