30b516eceb
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 | ||
| showfps.cpp | ||
| showfps.h | ||
| showfps.kcfg | ||
| showfps_config.cpp | ||
| showfps_config.desktop | ||
| showfps_config.h | ||
| showfps_config.ui | ||
| showfpsconfig.kcfgc | ||