diff options
| author | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
| commit | 8b12612bbf8ae4500a84634087a074d94a495eec (patch) | |
| tree | 2f32689ede0d74a38b7e81c88629e4419c41bf0f /src/views/dolphinviewactionhandler.cpp | |
| parent | a72543484b1358b29a06f2f45b065ad822981738 (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/views/dolphinviewactionhandler.cpp')
0 files changed, 0 insertions, 0 deletions