f1bbe935d3
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" |
||
---|---|---|
.. | ||
data | ||
CMakeLists.txt | ||
cube.cpp | ||
cube.h | ||
cube.kcfg | ||
cube_config.cpp | ||
cube_config.desktop | ||
cube_config.h | ||
cube_config.ui | ||
cube_inside.h | ||
cube_proxy.cpp | ||
cube_proxy.h | ||
cubeconfig.kcfgc |