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
8 years ago
parent
5e7bd7d0a1
commit
c1d0fb55cb
2 changed files with 4 additions and 4 deletions
Loading…
Reference in new issue