rebase and fix conflict 2

project-chip · Aug 21, 2023 · 836f0a5 · 836f0a5
1 parent 1f801a5
commit 836f0a5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -33,7 +33,7 @@
   ],
   "endpointTypes": [
     {
-      "id": 24,
+      "id": 1,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
         "id": 3,
@@ -10512,7 +10512,7 @@
       ]
     },
     {
-      "id": 21,
+      "id": 2,
       "name": "MA-onofflight",
       "deviceTypeRef": {
         "id": 8,
@@ -30401,7 +30401,7 @@
       ]
     },
     {
-      "id": 23,
+      "id": 3,
       "name": "MA-onofflight",
       "deviceTypeRef": {
         "id": 8,
@@ -34685,7 +34685,7 @@
       ]
     },
     {
-      "id": 22,
+      "id": 4,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
         "id": 53,