From e87fe7dc7d605497847be88f786ca0a507df1ccf Mon Sep 17 00:00:00 2001
From: Rob Davies <rob@microserveltd.co.uk>
Date: Fri, 31 Mar 2017 12:22:57 +0100
Subject: [PATCH] Update gitignore and settings

---
 web/.gitignore                 | 3 +++
 web/sites/default/settings.php | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/.gitignore b/web/.gitignore
index a4e2c9042..01ec33685 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -59,3 +59,6 @@ Thumbs.db
 
 # Ignore any extra git folders.
 */.git/
+
+# Ignore npm modules.
+node_modules
diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
index 24ab16aa5..25505ac39 100644
--- a/web/sites/default/settings.php
+++ b/web/sites/default/settings.php
@@ -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';