Skip to content

Commit 3450890

Browse files
bzbarsky-applepull[bot]
authored andcommitted
Fix ZAP ci. (#26813)
Merge conflict between new device being added and XML rename.
1 parent 4c3ab14 commit 3450890

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

examples/chef/devices/rootnode_pump_a811bb33a0.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ server cluster AccessControl = 31 {
145145
kRemoved = 2;
146146
}
147147

148-
struct Target {
148+
struct AccessControlTargetStruct {
149149
nullable cluster_id cluster = 0;
150150
nullable endpoint_no endpoint = 1;
151151
nullable devtype_id deviceType = 2;
@@ -155,7 +155,7 @@ server cluster AccessControl = 31 {
155155
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
156156
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
157157
nullable fabric_sensitive int64u subjects[] = 3;
158-
nullable fabric_sensitive Target targets[] = 4;
158+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
159159
fabric_idx fabricIndex = 254;
160160
}
161161

0 commit comments

Comments
 (0)