X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/42bd3e809b0fa95d3a463462e242caf40d98bf79..357607fbe9159afef9ba89f1dbe86abe7966efc8:/web/config_local.php

diff --git a/web/config_local.php b/web/config_local.php
index 00afede..eef2134 100644
--- a/web/config_local.php
+++ b/web/config_local.php
@@ -7,8 +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