694c42c440
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" |
||
|---|---|---|
| .. | ||
| dbusutils_p.h | ||
| kwin-runner-windows.desktop | ||
| org.kde.krunner1.xml | ||
| windowsrunnerinterface.cpp | ||
| windowsrunnerinterface.h | ||