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
l10n daemon script
4 years ago
parent
b7a93230a6
commit
228a007262
1 changed files with 1 additions and 0 deletions
Loading…
Reference in new issue