355faa54a3
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 | ||
compositing.cpp | ||
compositing.h | ||
compositing.ui | ||
kwincompositing.desktop | ||
main.cpp | ||
Messages.sh |