opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.5. For more information, see https://www.drupal.org/project/drupal/releases/8.2.5

Browse source
This commit is contained in:
Pantheon Automation 2017-01-04 16:50:53 -08:00 • committed by Greg Anderson
parent 8544b60b39
commit db56c09587
86 changed files with 2413 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sites/default/default.settings.php
View file

@ -762,13 +762,7 @@ if (file_exists(__DIR__ . '/settings.pantheon.php')) {
*
* Keep this code block at the end of this file to take full effect.
*/
<<<<<<< HEAD
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
}
=======
#
# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
# include $app_root . '/' . $site_path . '/settings.local.php';
# }
>>>>>>> b96f629ea4b63fb16b11b89c0a88fb8524e82359