diff options
| author | l10n daemon script <[email protected]> | 2026-02-11 01:42:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-11 01:42:12 +0000 |
| commit | 9014e2651cbbfc5e5baa3b6ce9f53d495dbaae2c (patch) | |
| tree | 96c7f8378eace17c30ff705931a672551ac5ac89 /src/dolphinpackageinstaller.cpp | |
| parent | 369d0dc5d6dc8b37ca057b6acfbb01a945dccb66 (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/dolphinpackageinstaller.cpp')
0 files changed, 0 insertions, 0 deletions