12a02451df
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 | ||
| decoration.cpp | ||
| decoration.h | ||
| kwin-packagestructure-decoration.desktop | ||