diff options
| author | l10n daemon script <[email protected]> | 2021-08-09 01:11:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-09 01:11:30 +0000 |
| commit | cb9142a9bbabe0d4adc65253ede01bc998cf0edb (patch) | |
| tree | 92a9a4fed741625bef08ac80da953d2c6c29e527 /src/settings/viewpropertiesdialog.cpp | |
| parent | a38f1c8eaedd30eabe3d55feb251119d74244852 (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