7fc05f1cf6
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" |
||
---|---|---|
.. | ||
common | ||
kwincompositing | ||
kwindecoration | ||
kwindesktop | ||
kwineffects | ||
kwinoptions | ||
kwinrules | ||
kwinscreenedges | ||
kwinscripts | ||
kwintabbox | ||
CMakeLists.txt |