1a40632fbc
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 | ||
dbusutils_p.h | ||
kwin-runner-windows.desktop | ||
main.cpp | ||
metadata.json | ||
org.kde.krunner1.xml | ||
windowsrunnerinterface.cpp | ||
windowsrunnerinterface.h |