espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(zigbee): fixed the dirty zigbee backport

Browse Source
This commit is contained in:
xieqinan@espressif.com
2024-12-12 11:36:21 +08:00
parent 411385cf8c
commit e18005cc12
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c
View File

@ -1,11 +1,7 @@
/* /*
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
* *
<<<<<<< HEAD
* SPDX-License-Identifier: LicenseRef-Included
=======
* 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 * Zigbee HA_on_off_switch Example
* *