diff options
| author | l10n daemon script <[email protected]> | 2022-04-25 01:52:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-25 01:52:30 +0000 |
| commit | 7153234e462fcb100093dedb490f55a8088cf4d7 (patch) | |
| tree | 3f4956e7f55b2d4efd719739a7cdaf9cc2f7bf8e /src/kitemviews/kfileitemmodelrolesupdater.cpp | |
| parent | be95cd3025b113e1a2b34b2b1a42ffe544b39c4e (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/kfileitemmodelrolesupdater.cpp')
0 files changed, 0 insertions, 0 deletions