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
b4319df579
commit
de1f728bdf
2 changed files with 2 additions and 2 deletions
Loading…
Reference in new issue