diff options
| author | l10n daemon script <[email protected]> | 2020-09-24 10:10:10 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-24 10:10:10 +0200 |
| commit | 71bc4498a37086b6805a0b837983d9a5253dd088 (patch) | |
| tree | 4f9f53683b662f1a5c78daff8395257243343bd4 /src/dolphinbookmarkhandler.cpp | |
| parent | a32cb1c915960320812e7d1d63fe68ffb729ba37 (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/dolphinbookmarkhandler.cpp')
0 files changed, 0 insertions, 0 deletions