Remove branch alias for 3.0 branch

Update .editorconfig
This commit is contained in:
Damian Mooyman 2017-11-28 13:08:03 +13:00
parent 4e36ec793e
commit b403d502da
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 50 additions and 52 deletions

View File

@ -14,6 +14,9 @@ trim_trailing_whitespace = true
indent_size = 2
indent_style = space
[composer.json]
indent_size = 4
# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516

View File

@ -42,11 +42,6 @@
"SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
}
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"scripts": {
"lint": "phpcs --standard=PSR2 -n src/ tests/php/"
},