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 | ||
diminactive.cpp | ||
diminactive.h | ||
diminactive.kcfg | ||
diminactive_config.cpp | ||
diminactive_config.desktop | ||
diminactive_config.h | ||
diminactive_config.ui | ||
diminactiveconfig.kcfgc |