diff options
| author | l10n daemon script <[email protected]> | 2022-07-15 01:51:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-15 01:51:02 +0000 |
| commit | d4ed58f6a920cc9887208ea9264e0f0da618835e (patch) | |
| tree | ceb414fe72a77fcc53502584ee55012b99e6f669 /src/settings/general/previewssettingspage.cpp | |
| parent | 513fe3bb428c9d10f40a93efeca60fbf95d89bec (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/general/previewssettingspage.cpp')
0 files changed, 0 insertions, 0 deletions