diff options
| author | l10n daemon script <[email protected]> | 2018-06-05 05:34:15 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-06-05 05:34:15 +0200 |
| commit | a8bd6f4b1f65d402aacc2d66097fc0cbde870028 (patch) | |
| tree | a3de7379606d7896e98f2b3047a24c095f2198ce /src/dolphinpart_ext.cpp | |
| parent | 3c6ecfa246c17077f2e84a45e56da8943d6db1c3 (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