mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	fix conflicts
This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| display: | ||||
|   - platform: ssd1306_i2c | ||||
|     i2c_id: i2c_bus | ||||
|     id: ssd1306_display | ||||
|     id: ft63x6_display | ||||
|     model: SSD1306_128X64 | ||||
|     reset_pin: ${reset_pin} | ||||
|     pages: | ||||
| @@ -11,6 +11,7 @@ display: | ||||
|  | ||||
| touchscreen: | ||||
|   - platform: ft63x6 | ||||
|     display: ft63x6_display | ||||
|     id: ft63x6_touchscreen | ||||
|     interrupt_pin: ${interrupt_pin} | ||||
|     transform: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user