diff options
| author | l10n daemon script <[email protected]> | 2026-07-03 01:43:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-07-03 01:43:59 +0000 |
| commit | 920e1171cae8680819571e7052d09a13263be776 (patch) | |
| tree | f471c1ef4d8eb3df9fe1b0ed6208653c5345f0f9 /src/statusbar/dolphinstatusbar.h | |
| parent | 96ac17d4ecbd3867f0bb68b4b3ea070213b31169 (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/statusbar/dolphinstatusbar.h')
0 files changed, 0 insertions, 0 deletions