aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-11-17 02:02:00 -0800
committerChris Rebert <[email protected]>2013-11-17 02:02:00 -0800
commit6b547b357aef8cadc2ddfc9ce41dc8e446cade95 (patch)
treeca9db92132b0aadf03e9fc5dfb8f7dfb2a893230
parentae4d5f21a96fab3691ca33e9e3747a01c467e10e (diff)
parent9a8a571ad1517f9a622e5db52808fd0f905ecf16 (diff)
downloadbootstrap-6b547b357aef8cadc2ddfc9ce41dc8e446cade95.tar.xz
bootstrap-6b547b357aef8cadc2ddfc9ce41dc8e446cade95.zip
Merge pull request #11509 from ZDroid/fix-indents
Fix some weird indents
-rw-r--r--Gruntfile.js4
-rw-r--r--browserstack.json2
-rw-r--r--composer.json2
3 files changed, 4 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index c3016a2b0..ebc3abc38 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -135,8 +135,8 @@ module.exports = function(grunt) {
options: {
reset: true,
relaxerror: [
- "Bad value X-UA-Compatible for attribute http-equiv on element meta.",
- "Element img is missing required attribute src."
+ "Bad value X-UA-Compatible for attribute http-equiv on element meta.",
+ "Element img is missing required attribute src."
]
},
files: {
diff --git a/browserstack.json b/browserstack.json
index 76564eb27..104d85476 100644
--- a/browserstack.json
+++ b/browserstack.json
@@ -2,7 +2,7 @@
"username": "--secure--",
"key": "--secure--",
"test_path": "js/tests/index.html",
- "browsers": [
+ "browsers": [
{
"browser": "firefox",
"browser_version": "latest",
diff --git a/composer.json b/composer.json
index be8ec3fc1..1638564fa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
, "license": "Apache-2.0"
, "extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "3.0.x-dev"
}
}
}