diff options
| author | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
| commit | c0d5537afb10f09aaa6b47a994e8f8024c1006b4 (patch) | |
| tree | 8487c351a74f6c737759ba63b609f1ad30aff821 /src/dolphintabbar.cpp | |
| parent | 9c432e6905c41193e0dff759ba5c61ac295e41ac (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/dolphintabbar.cpp')
0 files changed, 0 insertions, 0 deletions