diff options
| author | l10n daemon script <[email protected]> | 2023-03-06 01:43:29 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-03-06 01:43:29 +0000 |
| commit | 7b2a09511d5e2cb0ba85da33043007c9269ecad7 (patch) | |
| tree | 1891f138b59529906681fd15e56d9380387c8486 /src/dolphinbookmarkhandler.cpp | |
| parent | 104213acab967fbe28eb2c7434d58036f9d9ebb0 (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