From 67fa655ba78360381491c221083452dab929e730 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Sun, 7 Aug 2016 19:16:38 -0400
Subject: [PATCH] Removing changes from rebase.

---
 phing/tasks/properties.xml           | 11 -----------
 phing/tasks/setup.xml                |  2 +-
 template/readme/repo-architecture.md |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/phing/tasks/properties.xml b/phing/tasks/properties.xml
index 70926e632..9de055d98 100644
--- a/phing/tasks/properties.xml
+++ b/phing/tasks/properties.xml
@@ -23,17 +23,6 @@
     </then>
   </if>
 
-  <!-- Extract PHP variable values from local.settings.php. -->
-  <property name="local.settings.file" value="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
-  <if>
-    <not>
-        <available file="${local.settings.file}" type="file" />
-    </not>
-    <then>
-      <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${local.settings.file}" verbose="true"/>
-    </then>
-  </if>
-
   <echo>Executing commands against multisite "${multisite.name}"</echo>
 
   <!-- Default drush alias. -->
diff --git a/phing/tasks/setup.xml b/phing/tasks/setup.xml
index 091a8767f..e26f5a30d 100644
--- a/phing/tasks/setup.xml
+++ b/phing/tasks/setup.xml
@@ -48,7 +48,7 @@
 
   <target name="setup:drupal:settings" description="Create local settings files using default settings files.">
     <echo>Making ${docroot}/sites/default writable.</echo>
-    <chmod mode="0755" file="${docroot}/sites/default" failonerror="false" verbose="true"/>
+    <chmod mode="0755" file="${docroot}/sites/default" failonerror="false" verbose="true" />
 
     <!-- Ensure that settings.php exists and that it requires BLT settings files. -->
     <if>
diff --git a/template/readme/repo-architecture.md b/template/readme/repo-architecture.md
index 744ba748f..19bf07c45 100644
--- a/template/readme/repo-architecture.md
+++ b/template/readme/repo-architecture.md
@@ -36,7 +36,7 @@ The following is an overview of the purpose of each top level directory in the p
 
 ## Dependency Management
 
-All project and Drupal (module, themes, libraries) dependencies are managed via Composer. The management strategy is based on [The Drupal Project](https://github.com/drupal-composer/drupal-project). 
+All project and Drupal (module, themes, libraries) dependencies are managed via Composer. The management strategy is based on [The Drupal Project](https://github.com/drupal-composer/drupal-project).
 
 Modules, themes, and other contributed drupal projects can be added as dependencies in the root composer.json file.