From 65f0d4a000ce9e4d8732fa72f28c9f85801e07bb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 14 Apr 2026 16:28:50 -1000
Subject: [PATCH] merge

---
 esphome/core/application.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/core/application.h b/esphome/core/application.h
index 6fdf6c7100..4d05728ea6 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -569,7 +569,6 @@ inline void ESPHOME_ALWAYS_INLINE Application::before_loop_tasks_(uint32_t loop_
   this->in_loop_ = true;
 }
 
-<<<<<<< HEAD
 // NOLINTNEXTLINE(clang-diagnostic-unknown-attributes)
 inline void ESPHOME_ALWAYS_INLINE __attribute__((optimize("O2"))) Application::loop() {
 #ifdef USE_RUNTIME_STATS