l10n daemon script faf9297574 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-03-31 06:36:52 +02:00
..
CMakeLists.txt	[plugins/findmyphone] Don't link against core twice	2019-03-11 19:05:42 +01:00
findmyphoneplugin.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
findmyphoneplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-31 06:36:52 +02:00