diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
| commit | 438ede27dc86938275d4ea1d8bd57b1e174f6053 (patch) | |
| tree | d870eac6352d0ee940774751e858c414961da660 /doc | |
| parent | 9c9c9be45db17b236a131f3209327ea79790fd96 (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