Minor clean up after merge conflict

sev/exe/sev_import/src/os_templ/hw_templ/makefile

-include $(pwre_dir_symbols)
-
-
--include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
-
-ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
-endif

sev/exe/sev_import/src/os_templ/link_rule.mk

-ifndef link_rule_mk
-link_rule_mk := 1
-
-ifndef pwre_cxx
-  ifeq ($(PWRE_CONF_LIBHDF5),1)
-    ldsev = mpic++
-  else
-    ldsev = $(ldxx)
-  endif
-else
-  ldsev = $(pwre_cxx)
-endif
-
-link = $(ldsev) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(wb_msg_eobjs) $(rt_msg_eobjs) \
-	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libdir) $(pwre_conf_libpwrsev) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
-
-endif

sev/wbl/sev/src/os_templ/hw_templ/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
-
-ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk
-
-
-
-
-

simul/mmi/simul/src/os_templ/hw_templ/makefile

-include $(pwre_dir_symbols)
-
--include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
-
-ifeq ($($(type_name)_generic_mk),)
- -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
-endif
-
-ifeq ($($(type_name)_generic_mk),)
- include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
-endif
-
--include ../../special.mk
--include ../special.mk
--include special.mk
-
-
-
-
-

wb/lib/wb/qt/wb_wnav_qt.cqt

@@ -341,28 +341,23 @@ void WNavQtTraceObject::sel_convert_cb()
         wnav->parent_ctx, attrref, &buffp, 0, 1, format);
     if (sts) {
       selection_data_set(wnav, server, buffp);
-      free(node_list);
-      return;
     }
     break;
   }
   case wnav_eItemType_Object: {
-    memset(&attrref, 0, sizeof(attrref));
-    attrref.Objid = item->objid;
+    attrref = cdh_ObjidToAref(item->objid);
     int sts = (wnav->format_selection_cb)(
         wnav->parent_ctx, attrref, &buffp, 0, 0, format);
     if (sts) {
       selection_data_set(wnav, server, buffp);
-      free(node_list);
-      return;
     }
+    break;
   }
   default: {
     char name[200];
     brow_GetAnnotation(node_list[0], 0, name, sizeof(name));
     selection_data_set(wnav, server, name);
-    free(node_list);
-    return;
+    break;
   }
   }
   free(node_list);