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/offline-stg/wilder
l10n daemon script
7 years ago
parent
0984f6ccfd
commit
0aa9cb1f7a
1 changed files with 0 additions and 1 deletions
Loading…
Reference in new issue