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 | ||
main.qml | ||
presentwindows.cpp | ||
presentwindows.h | ||
presentwindows.kcfg | ||
presentwindows_config.cpp | ||
presentwindows_config.desktop | ||
presentwindows_config.h | ||
presentwindows_config.ui | ||
presentwindows_proxy.cpp | ||
presentwindows_proxy.h | ||
presentwindowsconfig.kcfgc |