diff options
| author | l10n daemon script <[email protected]> | 2022-05-16 01:50:33 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-16 01:50:33 +0000 |
| commit | 0b27270beec7a9b8309322b0c869e71dde30f3d2 (patch) | |
| tree | 00ec195e1694f13f14867e6b50f7b88400ebbe84 /src/settings/contextmenu/contextmenusettingspage.h | |
| parent | 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (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/settings/contextmenu/contextmenusettingspage.h')
0 files changed, 0 insertions, 0 deletions