diff options
| author | l10n daemon script <[email protected]> | 2019-12-16 05:22:38 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-12-16 05:22:38 +0100 |
| commit | 837936dd9b4cba148074761c6d831ec474844f2b (patch) | |
| tree | 1862cd460003e5a03f267182d20a9cbd75641e0f /doc | |
| parent | 8e80c1d6dc1ede9b0a44ea1bd949487280c17064 (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