diff options
| author | Rich Trott <rtrott@gmail.com> | 2016-08-06 12:11:02 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2016-08-09 21:19:02 -0700 |
| commit | e313c0286b1c1a7267516a7b2b4c01fa76c71ec0 (patch) | |
| tree | 7358ae3f4af0979c124eca46d734314df40a6bc6 /Makefile | |
| parent | 49e473a45fb3e13fdd4588c6241b71bbac4fe5ab (diff) | |
| download | android-node-v8-e313c0286b1c1a7267516a7b2b4c01fa76c71ec0.tar.gz android-node-v8-e313c0286b1c1a7267516a7b2b4c01fa76c71ec0.tar.bz2 android-node-v8-e313c0286b1c1a7267516a7b2b4c01fa76c71ec0.zip | |
tools: update to ESLint 3.2.2
PR-URL: https://github.com/nodejs/node/pull/7999
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -697,7 +697,7 @@ cpplint: @$(PYTHON) tools/cpplint.py $(CPPLINT_FILES) @$(PYTHON) tools/check-imports.py -ifneq ("","$(wildcard tools/eslint/bin/eslint.js)") +ifneq ("","$(wildcard tools/eslint/lib/eslint.js)") lint: jslint cpplint CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+ lint-ci: jslint-ci cpplint |