X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/357607fbe9159afef9ba89f1dbe86abe7966efc8..5bc9573c3235d959463e75f6103b027d6f5efe84:/web/config_local.php?ds=sidebyside

diff --git a/web/config_local.php b/web/config_local.php
index eef2134..a4614fd 100644
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -1,17 +1,13 @@
 <?php
 
-  $mysql_host = 'host';
+  $mysql_host = 'dbhost';
   $mysql_schema = 'meteo';
   $mysql_user = 'meteo';
-  $mysql_pwd = 'somestrictpasswd';
+  $mysql_pwd = 'somestronpasword';
   $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
+  $site_header = 'METEO';
                 
-?>
\ No newline at end of file
+?>