diff options
| author | l10n daemon script <[email protected]> | 2023-07-28 01:43:52 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-07-28 01:43:52 +0000 |
| commit | 2f0369b333ac5c714d59b74665e76a41a5936042 (patch) | |
| tree | 77c8d763534e86031195fd3b20745f47118c4693 /po | |
| parent | 3123c086a77c28730866e848178c7e2d9a9006cb (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')
0 files changed, 0 insertions, 0 deletions