From d9b61d9ed234b4417ee1614b005169e8d980c0d7 Mon Sep 17 00:00:00 2001
From: David Anson <david@dlaa.me>
Date: Thu, 7 May 2015 18:01:52 -0700
Subject: [PATCH] Update eslint dependency to 0.20.0.

---
 .eslintrc    | 1 +
 package.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 5c8c85f8..54f7c611 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -138,6 +138,7 @@
         "new-cap": 2,
         "new-parens": 2,
         "newline-after-var": 0,
+        "object-shorthand": 0,
         "one-var": 0,
         "operator-assignment": [2, "always"],
         "operator-linebreak": 2,
diff --git a/package.json b/package.json
index b52dc23e..7875e6ec 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "browserify": "^10.0.0",
-    "eslint": "^0.19.0",
+    "eslint": "^0.20.0",
     "istanbul": "^0.3.8",
     "nodeunit": "^0.9.1",
     "q": "^1.2.0"