From 33b18ce99800028c1e7f16e5749da6d337a288a8 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 15 Jan 2015 18:56:09 +1300 Subject: [PATCH] Fix merge error --- docs/en/04_Changelogs/3.1.9.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/docs/en/04_Changelogs/3.1.9.md b/docs/en/04_Changelogs/3.1.9.md index 17b6e4588..7f3abab6e 100644 --- a/docs/en/04_Changelogs/3.1.9.md +++ b/docs/en/04_Changelogs/3.1.9.md @@ -1,19 +1,5 @@ # 3.1.9 -<<<<<<< HEAD -# Overview - -This release replaces the 3.1.8 release, and resolves an issue where basic authentication would not work when PHP is running under CGI mode with Apache. - -## Upgrading - * Add the rule ``` RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]``` to the .htacces file in your sites root directory after the line ```RewriteEngine On```. - -### Bugfixes - - -## Changelog - -======= ## Upgrading ### File permissions @@ -71,5 +57,4 @@ This release includes an important security fix. * [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.9) * [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.9) - * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.9) ->>>>>>> composer/3.1 + * [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.9) \ No newline at end of file