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
10 years ago
parent
b971688f18
commit
df5e4e91ee
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue