kdeconnect-kde/plugins/sms
l10n daemon script 707a4bd252 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-09-15 05:55:10 +02:00
..
CMakeLists.txt Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
conversationsdbusinterface.cpp Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
conversationsdbusinterface.h Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
kdeconnect_sms.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-09-15 05:55:10 +02:00
smsplugin.cpp Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
smsplugin.h Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00