Update gitignore and settings

This commit is contained in:
Rob Davies 2017-03-31 12:22:57 +01:00
parent 002f40bc1a
commit e87fe7dc7d
2 changed files with 4 additions and 3 deletions

3
web/.gitignore vendored
View file

@ -59,3 +59,6 @@ Thumbs.db
# Ignore any extra git folders.
*/.git/
# Ignore npm modules.
node_modules

View file

@ -14,9 +14,7 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
* a local development environment, to insure that
* the site settings remain consistent.
*/
if (file_exists(__DIR__ . '/settings.pantheon.php')) {
include __DIR__ . "/settings.pantheon.php";
}
include __DIR__ . "/settings.pantheon.php";
$settings['install_profile'] = 'standard';