0b78955c12
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 | ||
kdeconnect_remotecontrol.json | ||
remotecontrolplugin.cpp | ||
remotecontrolplugin.h |