l10n daemon script 7efcc8bbda 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"		2023-07-25 01:37:00 +00:00
..
CMakeLists.txt	Adapt build system to also support Qt 6	2022-10-29 16:51:41 +02:00
findmyphoneplugin.cpp	Remove unneeded destructors from plugins	2023-07-22 16:01:21 +02:00
findmyphoneplugin.h	Use pragma once in plugins	2023-07-22 20:51:19 +00:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-07-25 01:37:00 +00:00