fix merge conflict

project-chip · Dec 8, 2021 · 1e077c6 · 1e077c6
1 parent 5cc1096
commit 1e077c6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h