diff options
| author | l10n daemon script <[email protected]> | 2021-07-04 01:17:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-07-04 01:17:03 +0000 |
| commit | 7f562433c03534933d118b3b4abd6ab85bb4cabb (patch) | |
| tree | b687cb5795b7ae527a6bff78e4aa653a8462c41e /src/search | |
| parent | 902e8ee07e2dd67a407af3f727a03b6486d2adf8 (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')
0 files changed, 0 insertions, 0 deletions