From c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Mon, 18 Sep 2017 15:41:25 -0700
Subject: Fix merge conflict; separate onboarding buy screen

---
 .eslintrc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to '.eslintrc')

diff --git a/.eslintrc b/.eslintrc
index 2eb0dc8b5..01f568618 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": 2017,
@@ -10,7 +11,9 @@
       "arrowFunctions": true,
       "objectLiteralShorthandMethods": true,
       "objectLiteralShorthandProperties": true,
-      "templateStrings": true
+      "templateStrings": true,
+      "classes": true,
+      "jsx": true
     },
   },
 
@@ -23,7 +26,8 @@
 
   "plugins": [
     "mocha",
-    "chai"
+    "chai",
+    "react"
   ],
 
   "globals": {
-- 
cgit v1.2.3