diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/settings/servicemodel.cpp | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (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