Fix CI

project-chip · Jul 13, 2023 · 029e40a · 029e40a
1 parent c009659
commit 029e40a
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 382 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2490,6 +2490,7 @@ server cluster ModeSelect = 80 {
   command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
+<<<<<<< HEAD
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
   bitmap Feature : BITMAP32 {
@@ -2528,11 +2529,6 @@ server cluster RefrigeratorAlarm = 87 {
     AlarmMap mask = 3;
   }
 
-<<<<<<< HEAD
-=======
-  readonly attribute AlarmMap mask = 0;
-  readonly attribute AlarmMap state = 2;
-  readonly attribute AlarmMap supported = 3;
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
   bitmap Feature : BITMAP32 {
@@ -2544,7 +2540,6 @@ server cluster TemperatureControl = 86 {
   readonly attribute temperature temperatureSetpoint = 0;
   readonly attribute temperature minTemperature = 1;
   readonly attribute temperature maxTemperature = 2;
->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6706,23 +6701,13 @@ endpoint 1 {
   }
 
   server cluster TemperatureControl {
-<<<<<<< HEAD
     ram      attribute selectedTemperatureLevel default = 0;
     callback attribute supportedTemperatureLevels;
-=======
-    ram      attribute temperatureSetpoint default = 1;
-    ram      attribute minTemperature default = 0;
-    ram      attribute maxTemperature default = 100;
->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-<<<<<<< HEAD
     ram      attribute featureMap default = 2;
-=======
-    ram      attribute featureMap default = 1;
->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
     ram      attribute clusterRevision default = 1;
   }