mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-31 07:03:55 +00:00 
			
		
		
		
	Merge branch 'api_conditional_memory' into integration
This commit is contained in:
		| @@ -149,8 +149,8 @@ class APIServer : public Component, public Controller { | |||||||
| #ifdef USE_API_YAML_SERVICES | #ifdef USE_API_YAML_SERVICES | ||||||
|     return this->user_services_; |     return this->user_services_; | ||||||
| #else | #else | ||||||
|     static const std::vector<UserServiceDescriptor *> empty; |     static const std::vector<UserServiceDescriptor *> EMPTY; | ||||||
|     return this->user_services_ ? *this->user_services_ : empty; |     return this->user_services_ ? *this->user_services_ : EMPTY; | ||||||
| #endif | #endif | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user