cfd296326b
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 | ||
resize.cpp | ||
resize.h | ||
resize.kcfg | ||
resize_config.cpp | ||
resize_config.desktop | ||
resize_config.h | ||
resize_config.ui | ||
resizeconfig.kcfgc |