diff options
| author | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
| commit | db408cf09d9cc106405fdb496e333246e795902a (patch) | |
| tree | d32ff74a9046665826a61357a204c6308a6f7ea0 /src/dolphinbookmarkhandler.cpp | |
| parent | 5a9a644fb8cb0d9e5cff8f511713552c7639ef54 (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