diff options
| author | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
| commit | c1eeb0e115b6074e296892c95192cf464c0c83c9 (patch) | |
| tree | 6280f8e1f958649fd59c42fc5ac53915c81136ed /src/dolphintabpage.cpp | |
| parent | 82c944f63f2994848f870053987388aa537e6fd8 (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/dolphintabpage.cpp')
0 files changed, 0 insertions, 0 deletions