chg: [i18n] Fix mrg conflict

Browse Source

pull/7257/head

Steve Clement 2021-03-26 13:52:01 +09:00

parent ebb1b8c415

commit 76472bf3fc

No known key found for this signature in database

GPG Key ID: 69A20F509BE4AEE9

1 changed files with 4172 additions and 7653 deletions

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

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

11825

app/Locale/default.pot Executable file → Normal file

View File

File diff suppressed because it is too large Load Diff