diff options
| author | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
| commit | fe6bb8bd6a076d8293e2090935ee41577324c760 (patch) | |
| tree | cfa9456ee7a785ce1c532454029ec54b31c48f8c /src/dolphinmainwindow.cpp | |
| parent | e402e1211cae466c7ba906dcb9e6337cd33d63bc (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/dolphinmainwindow.cpp')
0 files changed, 0 insertions, 0 deletions