mirror of
https://github.com/esphome/esphome.git
synced 2026-02-27 17:34:22 -07:00
Resolved conflicts in: - esphome/components/fan/fan.cpp: Preserved pointer-based preset mode optimization - esphome/components/fan/fan_traits.h: Kept cstring include for strcmp - esphome/components/web_server_idf/web_server_idf.cpp: Kept float_buf_size constant 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>