WS: fixed merge conflicts

Author: Jarkko Paso

source/6LoWPAN/ws/ws_bootstrap.c

@@ -533,7 +533,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
 
     cur->ws_info->hopping_schdule.channel_function = ws_bs_ie.channel_function;
     // TODO: Restart unicast schedule if configuration changed
-    ns_fhss_ws_set_parent(cur->ws_info->fhss_api, neighbor->mac64, &ws_neighbor->fhss_data.bc_timing_info);
+    ns_fhss_ws_set_parent(cur->ws_info->fhss_api, data->SrcAddr, &neighbor->fhss_data.bc_timing_info);
 
     if (!cur->ws_info->configuration_learned) {
         // Generate own hopping schedules Follow first parent broadcast and plans and also use same unicast dwell