3f42e61b1d
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 | ||
findthisdevice_config.cpp | ||
findthisdevice_config.h | ||
findthisdevice_config.ui | ||
findthisdeviceplugin.cpp | ||
findthisdeviceplugin.h | ||
kdeconnect_findthisdevice.json | ||
kdeconnect_findthisdevice_config.qml |