diff options
| author | l10n daemon script <[email protected]> | 2017-02-05 05:58:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-02-05 05:58:09 +0100 |
| commit | e3ea9b558e59b48e8b4a0abf779677093fbfde50 (patch) | |
| tree | f9ea33dc8a97f970282db62eb335d4c6098f1400 /src/settings/kcm/kcmdolphinservices.cpp | |
| parent | 5c74fc0666aec1cf8432b0f58528d9f17c5568d3 (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/kcmdolphinservices.cpp')
0 files changed, 0 insertions, 0 deletions