51534dae65
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 | ||
kdeconnect_sendnotifications.json.in | ||
kdeconnect_sendnotifications_config.desktop | ||
kdeconnect_sendnotifications_config.qml | ||
notificationslistener.cpp | ||
notificationslistener.h | ||
notifyingapplication.cpp | ||
notifyingapplication.h | ||
notifyingapplicationmodel.cpp | ||
notifyingapplicationmodel.h | ||
sendnotifications_config.cpp | ||
sendnotifications_config.h | ||
sendnotifications_config.ui | ||
sendnotificationsplugin.cpp | ||
sendnotificationsplugin.h |