diff options
| author | l10n daemon script <[email protected]> | 2023-06-16 01:40:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-06-16 01:40:55 +0000 |
| commit | 51fcd600a8adb235bd510724fb3b8f8df9e0c6b6 (patch) | |
| tree | c7aef154da569eb271f50d11388f4ad858782525 /src/kitemviews/kfileitemmodel.cpp | |
| parent | d63d53eff15f7ad14e0dc7032fbfc1f0821a9cda (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/kitemviews/kfileitemmodel.cpp')
0 files changed, 0 insertions, 0 deletions