diff options
| author | l10n daemon script <[email protected]> | 2022-02-20 01:50:36 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-02-20 01:50:36 +0000 |
| commit | d774088a52b04a28d4e9fc0ae894ac6477d060e0 (patch) | |
| tree | c89b98504e781a0f6a89a6c95d2f6ffe8946674d /src/kitemviews/kstandarditemlistwidget.cpp | |
| parent | 78753ad23c3540f9e470bab03630e25c22dd2d3c (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/kstandarditemlistwidget.cpp')
0 files changed, 0 insertions, 0 deletions