4d66241fb0
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 | ||
hidecursor.cpp | ||
hidecursor.h | ||
hidecursor_config.cpp | ||
hidecursor_config.h | ||
hidecursor_config.ui | ||
hidecursorconfig.kcfg | ||
hidecursorconfig.kcfgc | ||
main.cpp | ||
metadata.json |