From 2a8970b9871f3b8b5b84f382c14a728778b0ee9b Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Thu, 15 Sep 2016 12:47:11 +0300 Subject: [PATCH 1/1] =?utf8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?utf8?q?=D0=B1=D0=B0=D1=80=D0=B0=D1=85=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- web/config_local.php~ | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 web/config_local.php~ 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 @@ ->>>>>> 438eca78d7802bd2758a4969b80bb0be6b9f14f6 - -?> \ No newline at end of file -- 2.34.1