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-5.14
l10n daemon script
9 years ago
parent
f8f27526ea
commit
61bdf718a4
1 changed files with 5 additions and 0 deletions
Loading…
Reference in new issue