diff options
| author | l10n daemon script <[email protected]> | 2022-07-20 01:45:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-20 01:45:24 +0000 |
| commit | d0c3e373a131f9e9d1dc183c4d8c8b24fa89346c (patch) | |
| tree | 77760191fe9e104cc68686aef132274fbb040e46 /src/settings/dolphinsettingsdialog.cpp | |
| parent | 9bcac452caa1941ec667b47b00f8c8da019eb5e1 (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/settings/dolphinsettingsdialog.cpp')
0 files changed, 0 insertions, 0 deletions