Skip to content

Commit

Permalink
Merge branch 'master' of github.com:twbs/bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Dec 14, 2013
2 parents 11c6ab7 + 9e50078 commit 85316c8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion js/.jscs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return"],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
Expand Down

0 comments on commit 85316c8

Please sign in to comment.