diff options
| author | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
| commit | 3fde6cbeb0b2df48a91870c74c4ef74462a82058 (patch) | |
| tree | 8ec7df75dfc2fb7725fd8e796e10956b7c104441 /src/dolphinpart.cpp | |
| parent | 33d8c894f25958d3024bef8d9be3d9f880923056 (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.cpp')
0 files changed, 0 insertions, 0 deletions