l10n daemon script 45b09c8074 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"		2024-01-14 03:36:56 +00:00
..
CMakeLists.txt
conversationsdbusinterface.cpp
conversationsdbusinterface.h
kdeconnect_sms.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-14 03:36:56 +00:00
requestconversationworker.cpp
requestconversationworker.h
smsplugin.cpp
smsplugin.h