diff options
| author | l10n daemon script <[email protected]> | 2020-06-18 05:48:38 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-18 05:48:38 +0200 |
| commit | aea6128fe66171a411172089dcba85c90b89953f (patch) | |
| tree | 12aaa44578e904485f01c80fcd1798fa5a03ae6c /src/search/dolphinquery.cpp | |
| parent | af93215bfdb1c22e6a0914c26e33360602bc5ae2 (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