l10n daemon script 0fa2bcd464 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-04-10 06:05:14 +02:00
..
CMakeLists.txt	Find my phone runner	2019-02-08 23:59:42 +01:00
findmyphonerunner.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
findmyphonerunner.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
Messages.sh	Find my phone runner	2019-02-08 23:59:42 +01:00
plasma-runner-kdeconnect-findmyphone.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-10 06:05:14 +02:00