66039108a3
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" |
||
|---|---|---|
| .. | ||
| idletime | ||
| kdecorations | ||
| kglobalaccel | ||
| platforms | ||
| qpa | ||
| scenes | ||
| CMakeLists.txt | ||