From d9433ef69223a32d05abdca543fb530f2e6679e4 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Fri, 22 Nov 2019 09:42:09 +0100 Subject: [PATCH] mdns: fixed forgotten merge conflicts in debug code --- components/mdns/mdns.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c index 5fd82bf9c5..ac6388916c 100644 --- a/components/mdns/mdns.c +++ b/components/mdns/mdns.c @@ -5015,13 +5015,8 @@ void mdns_debug_packet(const uint8_t * data, size_t len) } _mdns_dbg_printf("\n"); } else if (type == MDNS_TYPE_AAAA) { -<<<<<<< HEAD - ip6_addr_t ip6; - memcpy(&ip6, data_ptr, MDNS_ANSWER_AAAA_SIZE); -======= esp_ip6_addr_t ip6; memcpy(&ip6, data_ptr, sizeof(esp_ip6_addr_t)); ->>>>>>> mdns: update mdns to use esp-netif for mdns supported services such as STA, AP, ETH _mdns_dbg_printf(IPV6STR "\n", IPV62STR(ip6)); } else if (type == MDNS_TYPE_A) { esp_ip4_addr_t ip;