diff options
| author | l10n daemon script <[email protected]> | 2022-05-01 03:11:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-01 03:11:08 +0000 |
| commit | 2834e581e0b734e24f2e3010c4a1bc3c41e2e78a (patch) | |
| tree | 2ac9171d8946f9fc1a1d17a83611a9eb4b7e34aa /src/kitemviews/kitemlistview.cpp | |
| parent | cef7ea3be6d94bc23cc3c6e91fa3010838614945 (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/kitemlistview.cpp')
0 files changed, 0 insertions, 0 deletions