6b0d2fc027
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" |
||
|---|---|---|
| .. | ||
| aurorae.cpp | ||
| aurorae.h | ||
| CMakeLists.txt | ||
| kwin-packagestructure-aurorae.desktop | ||