diff options
| author | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /js | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
| download | bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js')
| -rw-r--r-- | js/.jshintrc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/js/.jshintrc b/js/.jshintrc index 94c520d5c..fdfdfbbfb 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,14 +1,14 @@ { - "validthis": true, - "laxcomma" : true, - "laxbreak" : true, + "asi" : true, + "boss" : true, "browser" : true, - "eqeqeq" : false, - "eqnull" : true, + "curly" : false, "debug" : true, "devel" : true, - "curly" : false, - "boss" : true, + "eqeqeq" : false, + "eqnull" : true, "expr" : true, - "asi" : true + "laxbreak" : true, + "laxcomma" : true, + "validthis": true }
\ No newline at end of file |