Добавлен датчик уровня углекислоты MH-Z14

[weathermon.git] / web / config_local.php

diff --git a/web/config_local.php b/web/config_local.php
index 00afede31e0cd81198f5cdbc7dac38c6fd7a9c12..eef21349d8f264ae1cf2f68aa733d5d38d4be3bd 100644 (file)
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -7,8 +7,11 @@
   $mysql_port = 3306;
 
   setlocale(LC_ALL,'ru_RU.UTF8');
+<<<<<<< HEAD
+=======
 
   $valid_ip_start = ip2long('192.168.1.161');
   $valid_ip_end   = ip2long('192.168.1.190');
+>>>>>>> 438eca78d7802bd2758a4969b80bb0be6b9f14f6
                 
 ?>
\ No newline at end of file