diff options
| author | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
| commit | 696414069907b41f7738e3212ac0d68b58fed1bc (patch) | |
| tree | e8310c09c5892090b93d9878e3b89ceafce1c4cc /src/global.cpp | |
| parent | 943af95605c480fef0f98cbfabbabdef04d743dc (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 'src/global.cpp')
0 files changed, 0 insertions, 0 deletions