diff options
| author | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
| commit | 586252341ea69a60b64f404dd23ef93e59c1e16c (patch) | |
| tree | bfd5fff0b27bdddf74a438798e6c3f9f56590a5e /src/dolphinremoveaction.cpp | |
| parent | 0c7da668e724490b894b4d174b36d4be6002afc9 (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/dolphinremoveaction.cpp')
0 files changed, 0 insertions, 0 deletions