mirror of https://github.com/nymea/nymea.git
Conflicts: plugins/deviceplugins/rfswitch/rfswitch.cpp |
||
|---|---|---|
| .. | ||
| rfswitch.cpp | ||
| rfswitch.h | ||
| rfswitch.json | ||
| rfswitch.pro | ||
Conflicts: plugins/deviceplugins/rfswitch/rfswitch.cpp |
||
|---|---|---|
| .. | ||
| rfswitch.cpp | ||
| rfswitch.h | ||
| rfswitch.json | ||
| rfswitch.pro | ||