diff options
| author | l10n daemon script <[email protected]> | 2021-12-12 01:48:07 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-12 01:48:07 +0000 |
| commit | fbe1ecaa6ab2f96cfdd30cb61bea618de57c29e9 (patch) | |
| tree | 03e83cf0fb488aee832d8a86fdd024b557791aee /src/settings/viewmodes/dolphinfontrequester.cpp | |
| parent | 0d35d8963a40d4da0b8b31c5c2406e60921e9e30 (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/dolphinfontrequester.cpp')
0 files changed, 0 insertions, 0 deletions