9c0a71c37f
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 | ||
| kwin-packagestructure-scripts.desktop | ||
| scripts.cpp | ||
| scripts.h | ||