diff options
| author | l10n daemon script <[email protected]> | 2024-07-28 01:23:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-28 01:23:46 +0000 |
| commit | 15bd7990ac4dee19dbdbce6e79c9ea6625ecc0c1 (patch) | |
| tree | 5560eb830092f82953541253aa7c84df3a6b587c /po/ms | |
| parent | e93d9254832babc39df5cc5ee08970dcb4baf57f (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'po/ms')
0 files changed, 0 insertions, 0 deletions