Merge branch 'master' into FABButton

martinfrances107 · web-flow · commit fb8aff429f91 · 2019-06-01T18:06:40.000+01:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,10 +4,6 @@
     "plugin:prettier/recommended",
     "plugin:jsx-a11y/recommended"
   ],
-  "parser": "typescript-eslint-parser",
-  "parserOptions": {
-    "jsx": true
-  },
   "parser": "babel-eslint",
   "parserOptions": {
       "ecmaVersion": 6,
