diff options
| author | l10n daemon script <[email protected]> | 2026-06-02 02:07:16 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-02 02:07:16 +0000 |
| commit | 4d74e6555482dc289f5b2c2e1c7c0af2f80399d5 (patch) | |
| tree | 688ab06e7481fe4017ccc3f9e51452bf49971f0f /src/kitemviews/kitemlistview.cpp | |
| parent | 4b68a7ca5ea08df4bc108dfcb645fd8a067df7f2 (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