diff options
| author | l10n daemon script <[email protected]> | 2024-07-19 01:21:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-19 01:21:28 +0000 |
| commit | 8560c73e677186572a134ba427443924eeda9646 (patch) | |
| tree | 1aaeb534d42c0e4ab6c0d1c684ce89bf64597e71 /src/search/dolphinsearchbox.cpp | |
| parent | 8cea3f233687493640db9c10251ff1accd3d793c (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