diff options
| author | l10n daemon script <[email protected]> | 2016-02-19 09:23:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-02-19 09:23:18 +0000 |
| commit | 20cb1492e7815cf46e231839fe0fd982ce19ceff (patch) | |
| tree | a122c08dd6f63ffc85616760bea979bbd04bccc5 /src/settings/dolphin_versioncontrolsettings.kcfg | |
| parent | 6bc4f18f60f9acceb2b4a0338da35b1a04340a3f (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/dolphin_versioncontrolsettings.kcfg')
0 files changed, 0 insertions, 0 deletions