diff options
| author | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
| commit | 83964c2071893b65e6fd8dc96bad5388107c8ef3 (patch) | |
| tree | 77e6ceb4958d7729d7ba2b854565063ce05a426a /po/be@latin | |
| parent | 579eadeb6ddffb03e8043090a330c6dba0717299 (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/be@latin')
0 files changed, 0 insertions, 0 deletions