diff options
| author | l10n daemon script <[email protected]> | 2025-05-31 01:34:21 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-31 01:34:21 +0000 |
| commit | a1c9bc5595a21299dab9260c6a77c0561c95c8ba (patch) | |
| tree | fb7dfd89db108155507009d386ba975e0e365693 /src/dolphinpart_ext.cpp | |
| parent | 567bc7176042eb4b41ed56a276c95ab2029782dd (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/dolphinpart_ext.cpp')
0 files changed, 0 insertions, 0 deletions