diff options
| author | l10n daemon script <[email protected]> | 2020-09-09 06:36:13 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-09 06:36:13 +0200 |
| commit | ddccf4f3201d04bb9343a098bc882f1c17a85ad0 (patch) | |
| tree | db2b71da8f9f92aac2798f6678198e106bf31ce5 /src/dolphinbookmarkhandler.cpp | |
| parent | f73917872ae1ea4e67ba019d02267a5b2d942722 (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