a989a77a0d
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" |
||
---|---|---|
.. | ||
contents | ||
contents.hash | ||
contents.hash.sig | ||
metadata.desktop |