diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
| commit | 3984e607bb4437a38af16e007f1c23fbcff7dfb2 (patch) | |
| tree | 3f19b3d4d36c0f3eed6d827b771dcde9842bc63c /src/dolphincontextmenu.cpp | |
| parent | d8f9ca49d333540796713a8842a1bea7622d0444 (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/dolphincontextmenu.cpp')
0 files changed, 0 insertions, 0 deletions