diff options
| author | l10n daemon script <[email protected]> | 2025-07-28 01:32:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-28 01:32:54 +0000 |
| commit | b1b743c59c48f54378abc46ff055d221b68cb433 (patch) | |
| tree | 9312a6095e6f555580b31aea6c0cd573cfa7248a /src/settings/servicemodel.cpp | |
| parent | 8079e8a5f0496febf39e6090c3898ad0aa4d8e9d (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/settings/servicemodel.cpp')
0 files changed, 0 insertions, 0 deletions