e60c878647
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
showpaint.cpp | ||
showpaint.h | ||
showpaint_config.cpp | ||
showpaint_config.desktop | ||
showpaint_config.h | ||
showpaint_config.ui |