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.04
l10n daemon script
4 years ago
parent
e9c0a423b6
commit
3b7402b0c1
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue