l10n daemon script 96677dda33 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"		2021-01-17 06:36:34 +01:00
..
CMakeLists.txt	[plugins/findmyphone] Don't link against core twice	2019-03-11 19:05:42 +01:00
findmyphoneplugin.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
findmyphoneplugin.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-17 06:36:34 +01:00