SHA1
--- a/include/user_config.h
+++ b/include/user_config.h
@@ -11,7 +11,11 @@
 
				 #define ESP_WEBSERVER				0
			
 
				 #define ESP_PLATFORM				0
			
 
				 #define CH_AIRCON_DEVICE				0
			
 
				+<<<<<<< HEAD
			
 
				+#define ESPNOW_SLAVE				0
			
 
				+=======
			
 
				 #define ESPNOW_SLAVE				1
			
 
				+>>>>>>> 6c1c2767efceb84a5c1b2167c34517d589b2c768
			
 
				 #define ESPNOW_CONTROLLER			0
			
 
				 
			
 
				 #define DEVICE_RTC				0
Autor	SHA1 Správa	Dátum
Shang	7a51241493 Merge branch 'master' of http://git.minglink.com/Shang/esp_demo	9 rokov pred
Shang	eec8d7be63 test esp now	9 rokov pred
Shang	f88c18f107 init from zip	9 rokov pred