From 97f7321fea6e0011c3497a64067dc351661aa45e Mon Sep 17 00:00:00 2001 From: dmi3yy Date: Fri, 2 Mar 2018 10:55:35 +0200 Subject: [PATCH] fix conflict --- assets/cache/.htaccess | 2 -- assets/cache/updater/ht.access | 2 -- assets/cache/updater/index.html | 2 -- 3 files changed, 6 deletions(-) delete mode 100755 assets/cache/.htaccess delete mode 100755 assets/cache/updater/ht.access delete mode 100755 assets/cache/updater/index.html diff --git a/assets/cache/.htaccess b/assets/cache/.htaccess deleted file mode 100755 index 83c6d382fb..0000000000 --- a/assets/cache/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -order deny,allow -allow from all diff --git a/assets/cache/updater/ht.access b/assets/cache/updater/ht.access deleted file mode 100755 index 8f91d28b69..0000000000 --- a/assets/cache/updater/ht.access +++ /dev/null @@ -1,2 +0,0 @@ -order deny,allow -allow from all \ No newline at end of file diff --git a/assets/cache/updater/index.html b/assets/cache/updater/index.html deleted file mode 100755 index fdd3791786..0000000000 --- a/assets/cache/updater/index.html +++ /dev/null @@ -1,2 +0,0 @@ -

Unauthorized access

-You're not allowed to access file folder \ No newline at end of file