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
6 years ago
parent
6344c2fccf
commit
27882eb23d
1 changed files with 0 additions and 1 deletions
Loading…
Reference in new issue