diff options
| author | l10n daemon script <[email protected]> | 2024-05-31 01:20:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-31 01:20:40 +0000 |
| commit | 035d5b64e1698e55ac20b2f65e51caf08beac3de (patch) | |
| tree | 4207b2053e448fb16da677dba3e960ad51056f6b /src/dolphinpart.cpp | |
| parent | 0a8f84a52dcd246550b5ea0e795dd7b309f2ece1 (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