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/work/aacid/moreecm585defines
l10n daemon script
4 years ago
parent
437f5f250b
commit
5042078495
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue