diff options
| author | l10n daemon script <[email protected]> | 2020-09-20 09:20:49 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-20 09:20:49 +0200 |
| commit | a32cb1c915960320812e7d1d63fe68ffb729ba37 (patch) | |
| tree | 338bc70e017ddb0d17e13525b9ab066bc4635fcf /src/settings/viewpropertiesdialog.cpp | |
| parent | 65c2d95a7dca988f0ead00e105b8aad0c57732f7 (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/viewpropertiesdialog.cpp')
0 files changed, 0 insertions, 0 deletions