diff options
| author | l10n daemon script <[email protected]> | 2024-03-16 01:17:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-03-16 01:17:09 +0000 |
| commit | d7bdba870b88beca322ba667765828190d097e35 (patch) | |
| tree | d89f0769b873e73d4d612ba4b2f913e703f26e56 /src/settings/viewmodes/generalviewsettingspage.cpp | |
| parent | d9c712fda89053b2a05929ea7a4c4babb3001d7a (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/viewmodes/generalviewsettingspage.cpp')
0 files changed, 0 insertions, 0 deletions