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

Merge branch 'bugfix/fixed-zigbee-dirty-backport' into 'release/v5.2'

Browse Source 
fix(zigbee): fixed the dirty zigbee backport

See merge request espressif/esp-idf!35592
This commit is contained in:
Shu Chen
2024-12-12 15:46:22 +08:00
parent 24c98125dc e18005cc12
commit a41e39cd49
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
*
<<<<<<< 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
*