b33cb8c6cc
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" |
||
---|---|---|
.. | ||
bigscreenplugin.cpp | ||
bigscreenplugin.h | ||
CMakeLists.txt | ||
kdeconnect_bigscreen.json |