diff options
| author | l10n daemon script <[email protected]> | 2024-05-26 01:17:41 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-26 01:17:41 +0000 |
| commit | 34eb94366ecff868d6e6d66e27a4ca1191564ebc (patch) | |
| tree | 6bd065999fe542543eaae43fb4c4892918935396 /src/dolphinbookmarkhandler.cpp | |
| parent | dba9b3435d63b7febd12a153d83a422566d4ecfa (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