diff options
| author | l10n daemon script <[email protected]> | 2021-12-28 01:43:52 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-28 01:43:52 +0000 |
| commit | c071150b7d30c8826496f130b792aed47d4f8326 (patch) | |
| tree | 27e7eca88363ff85b56e688feb279a62ca3209f8 /src/dolphinbookmarkhandler.cpp | |
| parent | 4b224516f4c646b81a1d7842bcedf1c8fbbfc15f (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