fix(matter): mixed branches

Author: SuGlider

CMakeLists.txt

@@ -193,11 +193,7 @@ set(ARDUINO_LIBRARY_Matter_SRCS
   libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp
-<<<<<<< Updated upstream
-=======
-  libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterWaterFreezeDetector.cpp
->>>>>>> Stashed changes
   libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp

docs/en/matter/matter.rst

@@ -126,11 +126,7 @@ The library provides specialized endpoint classes for different device types. Ea
 * ``MatterHumiditySensor``: Humidity sensor (read-only)
 * ``MatterPressureSensor``: Pressure sensor (read-only)
 * ``MatterContactSensor``: Contact sensor (open/closed state)
-<<<<<<< Updated upstream
-=======
-* ``MatterRainSensor``: Rain sensor (detected/not detected state)
 * ``MatterWaterFreezeDetector``: Water freeze detector (detected/not detected state)
->>>>>>> Stashed changes
 * ``MatterOccupancySensor``: Occupancy sensor (occupied/unoccupied state)
 
 **Control Endpoints:**

libraries/Matter/keywords.txt

@@ -21,11 +21,7 @@ FanModeSequence_t	KEYWORD1
 MatterTemperatureSensor	KEYWORD1
 MatterHumiditySensor	KEYWORD1
 MatterContactSensor	KEYWORD1
-<<<<<<< Updated upstream
-=======
-MatterRainSensor	KEYWORD1
 MatterWaterFreezeDetector	KEYWORD1
->>>>>>> Stashed changes
 MatterPressureSensor	KEYWORD1
 MatterOccupancySensor	KEYWORD1
 MatterOnOffPlugin	KEYWORD1
@@ -95,13 +91,8 @@ setHumidity	KEYWORD2
 getHumidity	KEYWORD2
 setContact	KEYWORD2
 getContact	KEYWORD2
-<<<<<<< Updated upstream
-=======
-setRain	KEYWORD2
-getRain	KEYWORD2
 setFreeze	KEYWORD2
 getFreeze	KEYWORD2
->>>>>>> Stashed changes
 setPressure	KEYWORD2
 getPressure	KEYWORD2
 setOccupancy	KEYWORD2

libraries/Matter/src/Matter.h

@@ -29,11 +29,7 @@
 #include <MatterEndpoints/MatterTemperatureSensor.h>
 #include <MatterEndpoints/MatterHumiditySensor.h>
 #include <MatterEndpoints/MatterContactSensor.h>
-<<<<<<< Updated upstream
-=======
-#include <MatterEndpoints/MatterRainSensor.h>
 #include <MatterEndpoints/MatterWaterFreezeDetector.h>
->>>>>>> Stashed changes
 #include <MatterEndpoints/MatterPressureSensor.h>
 #include <MatterEndpoints/MatterOccupancySensor.h>
 #include <MatterEndpoints/MatterOnOffPlugin.h>
@@ -199,11 +195,7 @@ class ArduinoMatter {
   friend class MatterTemperatureSensor;
   friend class MatterHumiditySensor;
   friend class MatterContactSensor;
-<<<<<<< Updated upstream
-=======
-  friend class MatterRainSensor;
   friend class MatterWaterFreezeDetector;
->>>>>>> Stashed changes
   friend class MatterPressureSensor;
   friend class MatterOccupancySensor;
   friend class MatterOnOffPlugin;