6b0d2fc027
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/code | ||
CMakeLists.txt | ||
metadata.desktop |
6b0d2fc027
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/code | ||
CMakeLists.txt | ||
metadata.desktop |