From e4c7eb7e9e899474f384d5699e91c57f4c79f773 Mon Sep 17 00:00:00 2001
From: ricknjacky <jaikishanbrijwani@gmail.com>
Date: Tue, 26 Jan 2021 09:53:29 +0530
Subject: [PATCH] Merge Conflict resolution .elsintrc.json

---
 .eslintrc.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index c5f904b5ec..7cdfe7ebdb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -4,6 +4,12 @@
     "browser": true
   },
   "parser": "babel-eslint",
+  "parserOptions": {
+    "sourceType": "script",
+    "ecmaFeatures": {
+      "globalReturn": false
+    }
+  },
   "extends": ["eslint:recommended", "prettier"],
   "rules": {
     "no-console": "warn",