diff options
| author | l10n daemon script <[email protected]> | 2022-07-03 01:59:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-03 01:59:38 +0000 |
| commit | 7b4644c0842697b8fb56f23dbce6d7fcc6fec67e (patch) | |
| tree | a5bcc72dad82bdac6361f2a0d3b58f62e241b6a6 /src/dolphinrecenttabsmenu.cpp | |
| parent | 710d9af234c7990d7117431be901a9e483c63d3f (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/dolphinrecenttabsmenu.cpp')
0 files changed, 0 insertions, 0 deletions