l10n daemon script c42829a7d6 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"		2018-04-07 05:22:03 +02:00
..
CMakeLists.txt	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
dialog.ui	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
kdeconnect-handler.cpp	[URL Handler] Special-case label for phone URLs	2018-01-25 10:25:57 +01:00
Messages.sh	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.telhandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-07 05:22:03 +02:00