diff options
| author | l10n daemon script <[email protected]> | 2015-12-30 09:19:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-30 09:19:37 +0000 |
| commit | 889a574fcdde7d378cdcec75ffc5972b39efbf55 (patch) | |
| tree | 534595ef8e90087b139b4d28a0fc23b266bc92c6 /doc | |
| parent | 0004b0dd0a5a80b30e9148892e07d66a3b50d01f (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