262da1b7c9
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 | ||
wobblywindows.cpp | ||
wobblywindows.h | ||
wobblywindows.kcfg | ||
wobblywindows_config.cpp | ||
wobblywindows_config.desktop | ||
wobblywindows_config.h | ||
wobblywindows_config.ui | ||
wobblywindowsconfig.kcfgc |