diff options
| author | l10n daemon script <[email protected]> | 2019-07-31 05:06:34 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-07-31 05:06:34 +0200 |
| commit | 89239912d842d8b295360994b2c27c305cced30e (patch) | |
| tree | b60f2de8be9fba65fe14bd4f60900d82a02e5a0f /src/views/tooltips | |
| parent | 5bc8a93bfbaa25c6f1a50158f1662ee9fa741ff7 (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/views/tooltips')
0 files changed, 0 insertions, 0 deletions