diff options
| author | l10n daemon script <[email protected]> | 2022-01-28 01:45:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-01-28 01:45:57 +0000 |
| commit | 166e71533e83cf9f47e146c8625130b5d167a91f (patch) | |
| tree | ee78dedbc54cfb4afcedd8826ae0c3197111c99c /src/kitemviews/kstandarditemlistwidget.cpp | |
| parent | 65846125d7f4dd90acd69abf73161607ba76cc8b (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