Another fix for previous commit

Merge should be fine now
2020-11-18 15:49:16 +01:00 · 2020-11-18 15:49:16 +01:00 · 11fe099825
parent 0dfb894fcb
commit 11fe099825
1 changed files with 6 additions and 0 deletions
--- a/idm/integrationpluginidm.cpp
+++ b/idm/integrationpluginidm.cpp
@ -172,8 +172,14 @@ void IntegrationPluginIdm::update(Thing *thing)
        idm->onRequestStatus();

        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
        }
    }
 }