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-portage
l10n daemon script
6 years ago
parent
2b1a8bb206
commit
10febd70a7
1 changed files with 8 additions and 0 deletions
Loading…
Reference in new issue