X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/fa2166c94690f91d38102a3f061ad9e5db9fcdb6..2094fb89e05795f5daee526dc4617a169faba201:/web/config_local.php~?ds=sidebyside

diff --git a/web/config_local.php~ b/web/config_local.php~
index eef2134..1ca0c18 100644
--- a/web/config_local.php~
+++ b/web/config_local.php~
@@ -1,17 +1,13 @@
 <?php
 
-  $mysql_host = 'host';
+  $mysql_host = 'estia.rvb-home.lan';
   $mysql_schema = 'meteo';
   $mysql_user = 'meteo';
-  $mysql_pwd = 'somestrictpasswd';
+  $mysql_pwd = 'snovadozhdi';
   $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 = 'RVB.NAME';
                 
-?>
\ No newline at end of file
+?>