beb35d8b8f
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" |
||
|---|---|---|
| .. | ||
| declarative-plugin | ||
| package | ||
| CMakeLists.txt | ||
| decorationmodel.cpp | ||
| decorationmodel.h | ||
| kcm.cpp | ||
| kcm.h | ||
| kwindecoration.desktop | ||
| Messages.sh | ||
| utils.cpp | ||
| utils.h | ||
| window-decorations.knsrc | ||