301f7199fb
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 | ||
slide.cpp | ||
slide.h | ||
slide.kcfg | ||
slide_config.cpp | ||
slide_config.desktop | ||
slide_config.h | ||
slide_config.ui | ||
slideconfig.kcfgc |