From fe5a6847b5d51bd0e4120a4697eeaf7b2c468d92 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 13 Oct 2021 16:40:46 +1300
Subject: [PATCH 1/2] Bump version to 2021.11.0-dev

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index a9eec3e249..4f7d95d694 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2021.10.0-dev"
+__version__ = "2021.11.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From bb86db869a24ec88c0e0fd1d662d6f93ad5799be Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 13 Oct 2021 22:09:38 +1300
Subject: [PATCH 2/2] Fix bad merge

---
 esphome/components/api/api_connection.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 81ff11fcd9..47171ba50f 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -161,19 +161,6 @@ void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
   // pass
 }
 
-DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
-  // remote initiated disconnect_client
-  // don't close yet, we still need to send the disconnect response
-  // close will happen on next loop
-  ESP_LOGD(TAG, "%s requested disconnected", client_info_.c_str());
-  this->next_close_ = true;
-  DisconnectResponse resp;
-  return resp;
-}
-void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
-  // pass
-}
-
 #ifdef USE_BINARY_SENSOR
 bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state) {
   if (!this->state_subscription_)