mirror of
https://github.com/esphome/esphome.git
synced 2026-09-13 08:17:34 +00:00
merge
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user