mirror of
https://github.com/esphome/esphome.git
synced 2026-08-25 07:36:19 +00:00
# Conflicts: # esphome/components/bluetooth_connection/__init__.py # esphome/components/bluetooth_connection/bluetooth_connection.cpp # esphome/components/bluetooth_connection/bluetooth_connection.h # esphome/components/bluetooth_connection/bluetooth_connection_bluedroid.cpp # esphome/components/bluetooth_connection/bluetooth_connection_bluedroid.h # esphome/components/bluetooth_connection/bluetooth_connection_hub.cpp # esphome/components/bluetooth_connection/bluetooth_connection_hub.h # esphome/components/bluetooth_proxy/__init__.py # esphome/components/bluetooth_proxy/bluetooth_proxy.cpp # esphome/components/bluetooth_proxy/bluetooth_proxy.h # esphome/core/defines.h # tests/components/bluetooth_connection/__init__.py