diff options
| author | l10n daemon script <[email protected]> | 2025-08-01 01:37:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-08-01 01:37:09 +0000 |
| commit | e1b325a867ede95c5815ca11998017c67fc78ea9 (patch) | |
| tree | 7c11b381ba303c2ef4d001bc1adcd3c72f50519e /src/settings/dolphin_versioncontrolsettings.kcfg | |
| parent | 0ccc15422da4d7b8455ae988aed2ae38734ac96e (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/dolphin_versioncontrolsettings.kcfg')
0 files changed, 0 insertions, 0 deletions