l10n daemon script 0b1fbde12d SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"		2019-01-09 05:31:18 +01:00
..
CMakeLists.txt	Find my phone plugin	2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00
findmyphoneplugin.h	Fix include guards	2018-10-26 15:29:39 -06:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-09 05:31:18 +01:00