diff options
| author | l10n daemon script <[email protected]> | 2022-03-07 01:44:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-07 01:44:55 +0000 |
| commit | 7c6a34222c75b969882ab89a290a0a1ac9b481a3 (patch) | |
| tree | 11eba68a5596d9e9dc5549399e1ded9c362509f2 /src/settings/kcm/kcmdolphinnavigation.cpp | |
| parent | 3366f62b0979752249a7e38769c318c72100aac6 (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/kcm/kcmdolphinnavigation.cpp')
0 files changed, 0 insertions, 0 deletions