1

314eced8 · 尹佳钦 · 09d6f4ff · 8c997561 · 314eced8
Commit 314eced8 authored Sep 16, 2020 by 尹佳钦
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json ...rm/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json +4 -0

No files found.
--- a/platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json
+++ b/platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json
@@ -199,7 +199,11 @@
 	}
 	]
 }	
+<<<<<<< HEAD
 111
+=======
+
+>>>>>>> 8c997561eb40aaed27b20c9453e8ebab61d2eae7
 智能窗帘电机Z3S(KONKE)  （说明：杜亚款）	0x02020000	3067
 威刚系列.智能窗帘电机Z3S(KONKE)   （说明：威士达款）	0x02020001	3068
 双路智能灯控模块Z3S(KONKE)	0x01000002	3069