5265842028
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" |
||
---|---|---|
.. | ||
signedPackage | ||
testfallbackpackage | ||
testpackage | ||
background.svgz |