X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/357607fbe9159afef9ba89f1dbe86abe7966efc8..7580c60d80239c3a880e124c550c2353f8153d82:/web/config_local.php~?ds=inline

diff --git a/web/config_local.php~ b/web/config_local.php~
deleted file mode 100644
index eef2134..0000000
--- a/web/config_local.php~
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-  $mysql_host = 'host';
-  $mysql_schema = 'meteo';
-  $mysql_user = 'meteo';
-  $mysql_pwd = 'somestrictpasswd';
-  $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