diff options
| author | l10n daemon script <[email protected]> | 2024-01-05 02:08:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-05 02:08:48 +0000 |
| commit | e13a47f01ff96e3de87d59dc6d5da61009bba563 (patch) | |
| tree | 58be6e1f41c23b96bd4a95a7a2f9b892649524ba /src/dolphinbookmarkhandler.cpp | |
| parent | 74cad372427939cc7bebf0082448f02490aaf60f (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