From 95cba0247b2fefb5f2c4fac84074af2902d39ac2 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sun, 22 Feb 2026 13:10:11 +0100 Subject: [PATCH] Remove merge conflict marker Signed-off-by: Jacob Laursen --- bundles/org.openhab.binding.matter/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/bundles/org.openhab.binding.matter/README.md b/bundles/org.openhab.binding.matter/README.md index 6d717847d8f38..cadbaa93bd903 100644 --- a/bundles/org.openhab.binding.matter/README.md +++ b/bundles/org.openhab.binding.matter/README.md @@ -309,7 +309,6 @@ Possible channels include: | threadnetworkdiagnostics-routingrole | Number | Routing Role | The Thread routing role | Network | true | %d | 0=Unspecified, 1=Unassigned, 2=Sleepy End Device, 3=End Device, 4=Reed, 5=Router, 6=Leader | | wifinetworkdiagnostics-rssi | Number:Power | Signal | Wi-Fi signal strength indicator. | QualityOfService | true | %d %unit% | | | windowcovering-lift | Rollershutter | Window Covering Lift | Sets the window covering level - supporting open/close and up/down type commands | Blinds | | %.0f %% | | ->>>>>>> main ## Supported Matter Device Types