diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 09:28:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 09:28:24 +0000 |
| commit | 50e366431dd8533f87cd10289422dc470f128541 (patch) | |
| tree | b38e6d3a2ad7862e40b19ba4785254253fba8b57 /doc | |
| parent | 8529547344cf940e9e51e74e8711d41f008add03 (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