diff options
| author | l10n daemon script <[email protected]> | 2025-08-24 01:34:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-08-24 01:34:51 +0000 |
| commit | aa289451e6d82cc6dea266d98236ac0f8a47f2fe (patch) | |
| tree | 7c748053b3e0b906079a83dc541e8732c21533fa /src/dolphinmainwindow.cpp | |
| parent | d780f24dfb46093ceda5b47087fa18505f65f854 (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