b6f22a98a7
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 | ||
windowgeometry.cpp | ||
windowgeometry.h | ||
windowgeometry.kcfg | ||
windowgeometry_config.cpp | ||
windowgeometry_config.desktop | ||
windowgeometry_config.h | ||
windowgeometry_config.ui | ||
windowgeometryconfig.kcfgc |