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"remotes/origin/new-html5-permissions
l10n daemon script
5 years ago
parent
fce7bddcac
commit
b0acd55546
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue