mirror of
https://github.com/espressif/esp-idf
synced 2025-03-09 09:09:10 -04:00
fix(zigbee): fixed the dirty zigbee backport
This commit is contained in:
parent
faef56543b
commit
dc7bcad056
@ -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
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user