![]() 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" |
||
---|---|---|
.. | ||
colord-integration | ||
idletime | ||
kdecorations | ||
kglobalaccel | ||
kpackage | ||
krunner-integration | ||
nightcolor | ||
platforms | ||
qpa | ||
scenes | ||
screencast | ||
windowsystem | ||
CMakeLists.txt |