ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed rebase

master
Boernsman 2021-02-05 13:50:28 +01:00 committed by Michael Zanetti
parent b36f91e34e
commit c64012505d
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
idm/integrationpluginidm.cpp
View File

@ -149,20 +149,6 @@ void IntegrationPluginIdm::update(Thing *thing)
if (idm != nullptr) { if (idm != nullptr) {
idm->onRequestStatus(); idm->onRequestStatus();
} }
<<<<<<< HEAD
if (m_idmInfos.contains(thing)) {
<<<<<<< HEAD
ThingSetupInfo *info = m_idmInfos.take(thing);
info->finish(Thing::ThingErrorNoError);
=======
/* ThingSetupInfo *info = m_idmInfos.take(thing); */
/* qCDebug(dcIdm()) << "Finishing setup 4!"; */
/* info->finish(Thing::ThingErrorNoError); */
>>>>>>> 3b5ab5c... Another fix for previous commit
}
=======
>>>>>>> 27a88b6... Removed thread delay and used Timer instead
} }
} }