diff options
| author | l10n daemon script <[email protected]> | 2021-12-04 01:44:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-04 01:44:59 +0000 |
| commit | eeaadaf99514be5b1b37dab10035d9abb6fe056c (patch) | |
| tree | e3a38e2ab8631988d0fa12dfaef228f2b8ae8ea4 /src/kitemviews/kitemlistheader.cpp | |
| parent | 9ec88ec1aea35abedf3319d331c7a05188b7dba5 (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/kitemlistheader.cpp')
0 files changed, 0 insertions, 0 deletions