diff options
| author | l10n daemon script <[email protected]> | 2020-09-01 06:25:15 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-01 06:25:15 +0200 |
| commit | f15f74e241ec4bd1f271e2dd7245509c565e6c02 (patch) | |
| tree | e17bfed0ffd140a87ec44de4c6aebfe96ce49c3f /src/dolphinpart_ext.cpp | |
| parent | 7479fef79962cede2c5d5ad7383c11a83c4f978d (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