4b1b1b9b14
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
conversationsdbusinterface.cpp | ||
conversationsdbusinterface.h | ||
kdeconnect_sms.json | ||
requestconversationworker.cpp | ||
requestconversationworker.h | ||
smsplugin.cpp | ||
smsplugin.h |