Fix merge conflict tags

drydock_provisioner/control/bootdata.py

@@ -65,22 +65,8 @@ class BootdataResource(StatefulResource):
 
                 host_model = host_design.get_baremetal_node(hostname)
 
-                part_list = []
-
-                all_parts = host_design.get_promenade_config('all')
-
-                if all_parts is not None:
-                    part_list.extend([i.document for i in all_parts])
-
-                host_parts = host_design.get_promenade_config(hostname)
-
-                if host_parts is not None:
-                    part_list.extend([i.document for i in host_parts])
-
-                for t in host_model.tags:
-                    tag_parts = host_design.get_promenade_config(t)
-                    if t is not None:
-                        part_list.extend([i.document for i in tag_parts])
+                all_configs = host_design.get_promenade_config(['all', hostname].extend(host_model.tags))
+                part_list = [i.document for i in all_configs]
 
                 resp.body = "---\n" + "---\n".join([base64.b64decode(i.encode()).decode('utf-8') for i in part_list]) + "\n..."
                 return

drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py

@@ -325,7 +325,6 @@ class PyghmiTaskRunner(drivers.DriverTaskRunner):
                 status=hd_fields.TaskStatus.Complete,
                 result_detail=mci_id)
             return
-<<<<<<< HEAD
 
     def get_ipmi_session(self):
         """
@@ -390,5 +389,3 @@ class PyghmiTaskRunner(drivers.DriverTaskRunner):
 
 def list_opts():
     return {PyghmiDriver.driver_key: PyghmiDriver.pyghmi_driver_options}
-=======
->>>>>>> 064395f... Convert to cfg.CONF pattern