diff options
| author | l10n daemon script <[email protected]> | 2022-03-20 02:14:36 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-20 02:14:36 +0000 |
| commit | fa72ae8577d7bae31cd92c8d393893a1ec214f80 (patch) | |
| tree | d2b66c824598bceef4e982d25af605422a89bff3 /src/settings/settingspagebase.cpp | |
| parent | 990c6e7aa5b8035817c6e4c5a0bded10455f1f87 (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/settingspagebase.cpp')
0 files changed, 0 insertions, 0 deletions