788f42ddd4
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 | ||
metadata.json | ||
metadata.json.license |
788f42ddd4
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 | ||
metadata.json | ||
metadata.json.license |