57ad550181
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" |
||
|---|---|---|
| .. | ||
| lib | ||
| qml | ||
| aurorae.cpp | ||
| aurorae.h | ||
| aurorae.json | ||
| aurorae.knsrc | ||
| CMakeLists.txt | ||
| colorhelper.cpp | ||
| colorhelper.h | ||
| decorationoptions.cpp | ||
| decorationoptions.h | ||
| decorationplugin.cpp | ||
| decorationplugin.h | ||
| kwindecoration.desktop | ||