e712748881
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_lockdevice.json | ||
lockdeviceplugin-win.cpp | ||
lockdeviceplugin-win.h | ||
lockdeviceplugin.cpp | ||
lockdeviceplugin.h | ||
org.freedesktop.DBus.Properties.xml | ||
org.freedesktop.login1.xml | ||
org.freedesktop.ScreenSaver.xml |