diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
| commit | 9c43e3de7d989bed1798c8f529136316e1b45e0c (patch) | |
| tree | 4ab597d91a1f266e215259f734aa3d930300d497 /src/dolphinrecenttabsmenu.cpp | |
| parent | d6f95521b332a701a61d799eb2fd89c8d5ede7c7 (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