1) Переход на доставку без гарантии (старые данные копить нет смысла)

[weathermon.git] / web / config_local.php~

diff --git a/web/config_local.php~ b/web/config_local.php~
index eef21349d8f264ae1cf2f68aa733d5d38d4be3bd..1ca0c18ee7eced10dc670919548e4656f8eb694e 100644 (file)
--- 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
+?>