Merge branch 'master' of rvb.name:weathermon

[weathermon.git] / web / config_local.php

diff --git a/web/config_local.php b/web/config_local.php
index eef21349d8f264ae1cf2f68aa733d5d38d4be3bd..d6cce97947bfa30399bdc49702bf09383ba64cbf 100644 (file)
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -3,15 +3,12 @@
   $mysql_host = 'host';
   $mysql_schema = 'meteo';
   $mysql_user = 'meteo';
-  $mysql_pwd = 'somestrictpasswd';
+  $mysql_pwd = 'somestrongpasswd';
   $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
+  $valid_ip_start = ip2long('192.168.1.0');
+  $valid_ip_end   = ip2long('192.168.1.255');
                 
 ?>
\ No newline at end of file