diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
| commit | 82af09127d219d0111a38618747d651ef74029a6 (patch) | |
| tree | 472ca205e4b37c4f28f9562bf64465c53204cf2f /doc | |
| parent | 25cc15a5a2097faad3d647c72bd4c2dadac3f7ef (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 'doc')
0 files changed, 0 insertions, 0 deletions