mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	
			
				
					
						
					
					0d3bc21e97393a66be1b0ae3fdda8405df416345
				
			
			
		
	Resolved conflicts in: - esphome/components/api/list_entities.h - esphome/components/api/subscribe_state.h Both conflicts were about NOLINT comment style - chose upstream's inline comment format.
Description
				
					Languages
				
				
								
								
									C++
								
								64.8%
							
						
							
								
								
									Python
								
								35%
							
						
							
								
								
									C
								
								0.1%
							
						
					