8ad5bf21b0
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" |
||
|---|---|---|
| .. | ||
| package | ||
| CMakeLists.txt | ||
| effectsfilterproxymodel.cpp | ||
| effectsfilterproxymodel.h | ||
| kcm.cpp | ||
| kcm.h | ||
| kcm_kwin_effects.desktop | ||
| kwineffect.knsrc | ||
| Messages.sh | ||