diff --git a/composer.lock b/composer.lock index 9805774..51c2c0b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "197c6f07c2e08a57fd28c0f12b8d438b", + "content-hash": "62318b0dffdbca25b349863cf75ea367", "packages": [ { "name": "abraham/twitteroauth", diff --git a/scripts/retain-custom-htaccess.sh b/scripts/retain-custom-htaccess.sh deleted file mode 100755 index 41dd644..0000000 --- a/scripts/retain-custom-htaccess.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ -f ./web/.htaccess.custom ] -then - cd web && mv .htaccess .htaccess.default && cp .htaccess.custom .htaccess - git diff -s --exit-code .htaccess.default || echo 'NOTE: .htaccess.default file has changed! Be sure to integrate latest updates into .htaccess and .htaccess.custom, then commit all three files. For example, meld web/.htaccess.custom web/.htaccess.default' -fi