Merge branch 'master' into release-v2.5.2

Mike Nikles · Mike Nikles · commit cec1cbf3920c · 2016-08-04T17:35:52.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@
     - Add a new ES5 configuration ported to ESLint 2 and up
 2.5.1
     - Update line length to 200
+    - Remove rule for no-unresolved import
     - Remove 'strict' rule for modules
 2.5.0
     - Add an ES6 and JSX standard with lint rules.
