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/gbm-vnc
l10n daemon script
8 years ago
parent
e7dae04819
commit
da99315b17
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue