resolved conflict

inventory_provider/tasks/worker.py

@@ -568,12 +568,8 @@ def retrieve_and_persist_neteng_managed_device_list(
 @log_task_entry_and_exit
 def reload_router_config_try_all(self, hostname, lab=False):
     try:
-<<<<<<< Updated upstream
-        reload_router_config_nokia(hostname, lab)
-=======
         _reload_router_config_nokia(
             hostname, lab, self.log_info, self.log_warning)
->>>>>>> Stashed changes
     except Exception as e1:
         self.log_warning(
             f'error loading {hostname} info: {e1} - trying juniper')
@@ -596,17 +592,8 @@ def reload_router_config_try_all(self, hostname, lab=False):
 @log_task_entry_and_exit
 def reload_router_config_nokia(self, hostname, lab=False):
     try:
-<<<<<<< Updated upstream
-        self.log_info(
-            f'loading netconf data for {"lab " if lab else ""} {hostname}')
-        netconf_config = retrieve_and_persist_netconf_config_nokia(
-            hostname, lab, self.log_warning)
-        r = get_next_redis(InventoryTask.config)
-        refresh_nokia_interface_list(hostname, netconf_config, r, lab)
-=======
         _reload_router_config_nokia(
             hostname, lab, self.log_info, self.log_warning)
->>>>>>> Stashed changes
     except Exception as e:
         errmsg = f'unhandled exception loading {hostname} info: {e}'
         logger.exception(errmsg)