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"wilder-work
l10n daemon script
8 years ago
parent
d8ad34a348
commit
7967713a3e
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue