Merge conflict

stipsan · Aug 2, 2016 · 939fd3e · 939fd3e
2 parents cf37383 + 8c7b5ad
commit 939fd3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "coveralls": "2.11.12",
     "css-loader": "0.23.1",
     "enzyme": "2.4.1",
-    "eslint": "3.2.0",
+    "eslint": "3.2.2",
     "eslint-config-airbnb": "10.0.0",
     "eslint-plugin-import": "1.12.0",
     "eslint-plugin-jsx-a11y": "2.0.1",