diff options
| author | l10n daemon script <[email protected]> | 2021-04-23 01:19:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-04-23 01:19:55 +0000 |
| commit | 020ba2c3fc94336545f6b8d7c13c9a615000482a (patch) | |
| tree | 162a2222c6664375ed2f18b5ed3471e49e03f70d /src/kitemviews/kfileitemmodel.cpp | |
| parent | cede4fed799a17c2ecd6186ef8f731c61b4a4139 (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/kfileitemmodel.cpp')
0 files changed, 0 insertions, 0 deletions