diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/core/jshint.js | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'node_modules/montage/core/jshint.js')
| -rwxr-xr-x | node_modules/montage/core/jshint.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/jshint.js b/node_modules/montage/core/jshint.js index 584b5aef..24f18522 100755 --- a/node_modules/montage/core/jshint.js +++ b/node_modules/montage/core/jshint.js | |||
| @@ -3928,7 +3928,7 @@ var JSHINT = (function (setup) { | |||
| 3928 | 3928 | ||
| 3929 | JSHINT.edition = '2011-04-16'; | 3929 | JSHINT.edition = '2011-04-16'; |
| 3930 | 3930 | ||
| 3931 | return itself; | 3931 | return itself; |
| 3932 | }); | 3932 | }); |
| 3933 | 3933 | ||
| 3934 | // Make JSHINT a CommonJS module, if possible. | 3934 | // Make JSHINT a CommonJS module, if possible. |