diff options
| author | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
| commit | 2c29c7ed28f7389ec79907760311fce3a26622c2 (patch) | |
| tree | 6a2ff416f91767db8b3d9db03195a2e3a3630a44 /src/settings/servicemodel.cpp | |
| parent | 7002dc4e8aacf29826864271c0d11d20d94b4b7b (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