954151ca97
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" |
||
---|---|---|
.. | ||
kcm | ||
qml | ||
CMakeLists.txt | ||
expoarea.cpp | ||
expoarea.h | ||
expolayout.cpp | ||
expolayout.h | ||
main.cpp | ||
metadata.json | ||
overviewconfig.kcfg | ||
overviewconfig.kcfgc | ||
overvieweffect.cpp | ||
overvieweffect.h |