commit 9562ce812a4669d5d3d9a2f93dc0d27e357aa8d5
author Boris Zbarsky <bzbarsky@apple.com> Wed May 24 15:40:03 2023 -0400
committer GitHub <noreply@github.com> Wed May 24 15:40:03 2023 -0400
tree 0c379fea14f8e1a80109e4436c7526034b05b6e9
parent f9731a8105069b0caf41b56285bf487510e74bc8

Fix ZAP ci. (#26813)

Merge conflict between new device being added and XML rename.

examples/chef/devices/rootnode_pump_a811bb33a0.matter

diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 8859b11..8903b51 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -145,7 +145,7 @@
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -155,7 +155,7 @@
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }