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

diff --git a/web/config_local.php b/web/config_local.php
index 9c9adb2..eef2134 100644
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -7,5 +7,11 @@
   $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
                 
 ?>
\ No newline at end of file