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/kf6
l10n daemon script
3 years ago
parent
d1afb50055
commit
22f11a2e19
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue