From e18005cc1278045b5af7bdbd9cad8236ea11acc3 Mon Sep 17 00:00:00 2001 From: "xieqinan@espressif.com" Date: Thu, 12 Dec 2024 11:36:21 +0800 Subject: [PATCH] fix(zigbee): fixed the dirty zigbee backport --- .../zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c b/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c index 94fdeb31c2..64459f04b3 100644 --- a/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c +++ b/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c @@ -1,11 +1,7 @@ /* * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * -<<<<<<< HEAD - * SPDX-License-Identifier: LicenseRef-Included -======= * SPDX-License-Identifier: LicenseRef-Included ->>>>>>> a41c2d498eb... feat(zigbee): Upgrade the Zigbee lib to v1.6 for Zigbee examples * * Zigbee HA_on_off_switch Example *