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/release/22.08
l10n daemon script
4 years ago
parent
02feca74ce
commit
8edcd52593
3 changed files with 3 additions and 3 deletions
Loading…
Reference in new issue