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/Applications/18.04
l10n daemon script
8 years ago
parent
863ae954a7
commit
42650e4f27
2 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue