954151ca97
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" |
||
---|---|---|
.. | ||
.directory | ||
CMakeLists.txt | ||
contrast.cpp | ||
contrast.h | ||
contrastshader.cpp | ||
contrastshader.h | ||
main.cpp | ||
metadata.json |