resolve merge conflicts

2015-02-17 21:30:41 -05:00
parent 3a6e50db99 b99ce3736f
commit 9c71cc6d1f
9 changed files with 139 additions and 38 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -15,7 +15,8 @@
        "__dirname": true,
        "module": true,
        "console": true,
-        "setTimeout": true
+        "setTimeout": true,
+        "define": true
    },
    "rules": {
        "quotes": "single",