c240755dee
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" |
||
---|---|---|
.. | ||
shaders | ||
CMakeLists.txt | ||
coverswitch.cpp | ||
coverswitch.h | ||
coverswitch.kcfg | ||
coverswitch_config.cpp | ||
coverswitch_config.desktop | ||
coverswitch_config.h | ||
coverswitch_config.ui | ||
coverswitchconfig.kcfgc |