78c0095a5d
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 | ||
| magiclamp.cpp | ||
| magiclamp.h | ||
| magiclamp.kcfg | ||
| magiclamp_config.cpp | ||
| magiclamp_config.desktop | ||
| magiclamp_config.h | ||
| magiclamp_config.ui | ||
| magiclampconfig.kcfgc | ||