From 1607004508e425f1f0d8d7fdc43cae1e414c5680 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Sat, 30 Oct 2021 10:14:43 -0400
Subject: [PATCH] Fix ZAP bustage from merge conflict. (#11244)

https://github.com/project-chip/connectedhomeip/pull/10752 added a generated line
based on a template that https://github.com/project-chip/connectedhomeip/pull/10942
had removed.
---
 .../zap-generated/chip/devicecontroller/ClusterInfoMapping.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 73ba96d648c921..fe366bbf9678f8 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -5332,7 +5332,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> modeSelectClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo modeSelectchangeToModeCommandParameterInfo =
         new CommandParameterInfo("ModeSelect", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =