diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
| commit | 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 (patch) | |
| tree | 93e4f79346cd98d66b7cbe05b1c4fed55df0f7ac /src/search | |
| parent | c270f4713691e6918054b4bb294e1016cedfbdbe (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