diff options
| author | l10n daemon script <[email protected]> | 2022-06-25 02:01:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-25 02:01:46 +0000 |
| commit | a97adfc4fd3287ca53adb3dc2f87739447c3d0c6 (patch) | |
| tree | e20e0fc150d15163972fedd6b6b0762c8fe515d1 /src/dolphinrecenttabsmenu.cpp | |
| parent | 73ff57bef44984643bf1ffdb9a478095cfb78dfb (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