diff options
| author | l10n daemon script <[email protected]> | 2022-09-28 02:00:06 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-09-28 02:00:06 +0000 |
| commit | 13712a50652047bda8d7c2683ef1278552061680 (patch) | |
| tree | 86d6793d9ee6be305e88dbc6d9697ceb114a15c8 /po/ca/docs | |
| parent | aa54a68e936af4a1a2de0cb7e153cd83b27d5cdb (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/ca/docs')
0 files changed, 0 insertions, 0 deletions