diff options
| author | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
| commit | ae7a57ecbf7e2375fa79a910fdf74bf97e69b3ad (patch) | |
| tree | 9282f68e02e774d14e33db4e42e36cac98c5415c /src/dolphinpart_ext.cpp | |
| parent | 76b2443130955a7a830d06ef23f647950ad48507 (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