Skip to content

Commit

Permalink
Removing changes from rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash committed Aug 7, 2016
1 parent d13c7f4 commit 67fa655
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
11 changes: 0 additions & 11 deletions phing/tasks/properties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion template/readme/repo-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 67fa655

Please sign in to comment.