Skip to content

Commit

Permalink
Merge conflict resolved
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Michels <markus7017@gmail.com>
  • Loading branch information
markus7017 committed Dec 22, 2019
1 parent c2fa475 commit 1e3e796
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bundles/org.openhab.binding.shelly/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Shelly Binding

This Binding integrated Shelly devices.
This Binding integrates [Shelly devices](https://shelly.cloud/).

## Supported Devices

Expand All @@ -25,9 +25,9 @@ This Binding integrated Shelly devices.
| shellysense | Shelly Motion and IR Controller |
| shellydevice | A password protected device or an unknown type |

## Firmware
### Firmware

To utilize all features the binding requires firmware version 1.5.2 or newer.
To utilize all features, the binding requires firmware version 1.5.2 or newer.
This should be available for all devices.
Older versions work in general, but have impacts to functionality (e.g. no events for battery powered devices).

Expand Down

0 comments on commit 1e3e796

Please sign in to comment.