diff options
| author | l10n daemon script <[email protected]> | 2017-05-25 04:21:54 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-05-25 04:21:54 +0200 |
| commit | 4d9c396a9877ff459703c6372b5426860a32400b (patch) | |
| tree | 0a89368c08bf4e660c6076b89befa969579f3763 /src/dolphinpart_ext.cpp | |
| parent | 95f9dc9de00e4663ade9506bd1b7b58816d13458 (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/dolphinpart_ext.cpp')
0 files changed, 0 insertions, 0 deletions