af34144f7f
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 | ||
scale.cpp | ||
scale.h | ||
scale.kcfg | ||
scale_config.cpp | ||
scale_config.desktop | ||
scale_config.h | ||
scale_config.ui | ||
scaleconfig.kcfgc |