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

[weathermon.git] / web / config_local.php

diff --git a/web/config_local.php b/web/config_local.php
index c087aeac5fe31b4b7701dac6b3ad41cc716c940c..eef21349d8f264ae1cf2f68aa733d5d38d4be3bd 100644 (file)
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -1,12 +1,17 @@
 <?php
 
 <?php
 

-  $mysql_host = 'hostname';
+  $mysql_host = 'host';

   $mysql_schema = 'meteo';
   $mysql_user = 'meteo';
   $mysql_schema = 'meteo';
   $mysql_user = 'meteo';

-  $mysql_pwd = '***';
+  $mysql_pwd = 'somestrictpasswd';

   $mysql_port = 3306;
   $mysql_port = 3306;

-          
+

   setlocale(LC_ALL,'ru_RU.UTF8');
   setlocale(LC_ALL,'ru_RU.UTF8');

-                            
-?>
-                            
\ No newline at end of file
+<<<<<<< HEAD
+=======
+
+  $valid_ip_start = ip2long('192.168.1.161');
+  $valid_ip_end   = ip2long('192.168.1.190');
+>>>>>>> 438eca78d7802bd2758a4969b80bb0be6b9f14f6
+                
+?>
\ No newline at end of file