diff options
| author | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
| commit | 1d47e9691330ad40113e3652ab2f158a25665ece (patch) | |
| tree | 7594ca25a09d8ec6f7c618322759486a709b5738 /src/settings/dolphinsettingsdialog.cpp | |
| parent | 7d3e9f726b0cb4be651fc2f62ebf709288e30769 (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