rebase and fix conflicts

project-chip · Aug 21, 2023 · 521c24c · 521c24c
1 parent 262f130
commit 521c24c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -33,7 +33,7 @@
   ],
   "endpointTypes": [
     {
-      "id": 13,
+      "id": 2,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
         "id": 2,
@@ -6252,7 +6252,7 @@
       ]
     },
     {
-      "id": 14,
+      "id": 1,
       "name": "MA-dishwasher",
       "deviceTypeRef": {
         "id": 47,
@@ -10845,4 +10845,4 @@
     }
   ],
   "log": []
-}
+}
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -33,7 +33,7 @@
   ],
   "endpointTypes": [
     {
-      "id": 5,
+      "id": 1,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
         "id": 2,
@@ -5790,7 +5790,7 @@
       ]
     },
     {
-      "id": 6,
+      "id": 2,
       "name": "MA-dimmablelight",
       "deviceTypeRef": {
         "id": 9,

diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -33,7 +33,7 @@
   ],
   "endpointTypes": [
     {
-      "id": 9,
+      "id": 1,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
         "id": 2,
@@ -5536,7 +5536,7 @@
       ]
     },
     {
-      "id": 10,
+      "id": 2,
       "name": "MA-dimmablelight",
       "deviceTypeRef": {
         "id": 9,