fix merge conflict

project-chip · Dec 8, 2021 · 08eceef · 08eceef
1 parent 68c3619
commit 08eceef
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 4 deletions.
diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h