-
Conflicts: libkdeconnect/devicesmodel.cpp libkdeconnect/devicesmodel.h libkdeconnect/notificationsmodel.cpp libkdeconnect/notificationsmodel.h
af709790
Conflicts: libkdeconnect/devicesmodel.cpp libkdeconnect/devicesmodel.h libkdeconnect/notificationsmodel.cpp libkdeconnect/notificationsmodel.h