diff options
| author | l10n daemon script <[email protected]> | 2022-09-21 01:48:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-09-21 01:48:38 +0000 |
| commit | 6c65d06bcd4b34ef7a82203b3ba06b6c3604986b (patch) | |
| tree | 8bc1c4ec57ab20e55f92e16f518f42bbe91b34b5 /src/search/dolphinquery.cpp | |
| parent | fede2094e3ffb1e4ba738727af1832b6bdd3fe35 (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/dolphinquery.cpp')
0 files changed, 0 insertions, 0 deletions