fix merge conflict

project-chip · Dec 8, 2021 · d1d46d1 · d1d46d1
1 parent 68c3619
commit d1d46d1
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