Commit 90a5c45e13e1e910c019e3bb3e8ee76b0bd8ee6c
1 parent
4ae0b1cc
Repo Fix
Showing
1 changed file
with
0 additions
and
3 deletions
.htaccess
| ... | ... | @@ -61,10 +61,7 @@ Options +SymLinksIfOwnerMatch |
| 61 | 61 | #AcceptPathInfo On |
| 62 | 62 | |
| 63 | 63 | AddOutputFilter DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css |
| 64 | -<<<<<<< HEAD:.htaccess | |
| 65 | -======= | |
| 66 | 64 | # The following seems to breaking things on ZendServer - kgf |
| 67 | ->>>>>>> 3021d9ce95b467f66a2f65312d7db0e1f55c0d8c:.htaccess | |
| 68 | 65 | #ExpiresActive ON |
| 69 | 66 | #ExpiresByType text/html "access plus 1 day" |
| 70 | 67 | #ExpiresByType text/css "access plus 1 day" | ... | ... |