diff options
| author | Marc Delisle <marc@infomarc.info> | 2013-07-28 14:17:38 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2013-07-28 14:17:38 +0400 |
| commit | 269d0c89fe0c652389295785ed9a9dc282c7616e (patch) | |
| tree | 4e17ea572dd16a1c6b745f62f55e9abb0ff591e8 /setup | |
| parent | 6df3c0adb58c632e6cfd092f11199beb8e8311c4 (diff) | |
| parent | 836529be425c5a309549ef440ee4d3bd6b30ca29 (diff) | |
Fix merge conflicts
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/frames/.htaccess | 3 | ||||
| -rw-r--r-- | setup/lib/.htaccess | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/setup/frames/.htaccess b/setup/frames/.htaccess deleted file mode 100644 index 56baee608b..0000000000 --- a/setup/frames/.htaccess +++ /dev/null @@ -1,3 +0,0 @@ -# This folder does not require access over HTTP -# (the following directive denies access by default) -Order allow,deny diff --git a/setup/lib/.htaccess b/setup/lib/.htaccess deleted file mode 100644 index 56baee608b..0000000000 --- a/setup/lib/.htaccess +++ /dev/null @@ -1,3 +0,0 @@ -# This folder does not require access over HTTP -# (the following directive denies access by default) -Order allow,deny |