diff options
| author | l10n daemon script <[email protected]> | 2025-10-09 10:45:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-09 10:45:22 +0000 |
| commit | 8d6fd599e68ff93f28071285d076f86b24bdccc0 (patch) | |
| tree | fde2e5c3a48d23dcdfa7cc45843bea34e1774a43 /src/dolphinbookmarkhandler.cpp | |
| parent | 576d104b34a347d30ab57ca2928fd49892628e2e (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