diff options
| author | l10n daemon script <[email protected]> | 2022-05-06 01:46:29 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-06 01:46:29 +0000 |
| commit | 553cb880c249c34794d694836cc53a7f4bb31858 (patch) | |
| tree | 414fd533692f8e7db7506cce91825239433a3162 /src/search/dolphinsearchbox.cpp | |
| parent | ab9fcf0041d5ea220e07b4abe4d53bb10c385be2 (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/search/dolphinsearchbox.cpp')
0 files changed, 0 insertions, 0 deletions