prune

goodjoblife · Sep 12, 2023 · 8ba7128 · 8ba7128
1 parent 449615f
commit 8ba7128
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 30 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -46,13 +46,6 @@ module.exports = {
               contexts: path.resolve('./src/contexts'),
               graphql: path.resolve('./src/graphql'),
               hooks: path.resolve('./src/hooks'),
-<<<<<<< HEAD
-              contexts: path.resolve('./src/contexts'),
-              constants: path.resolve('./src/constants'),
-              apis: path.resolve('./src/apis'),
-              actions: path.resolve('./src/actions'),
-=======
->>>>>>> upstream/dev
               selectors: path.resolve('./src/selectors'),
               utils: path.resolve('./src/utils'),
             },

diff --git a/jsconfig.json b/jsconfig.json
@@ -9,16 +9,8 @@
             "contexts/*": ["src/contexts/*"],
             "graphql/*": ["src/graphql/*"],
             "hooks/*": ["src/hooks/*"],
-<<<<<<< HEAD
-            "contexts/*": ["src/contexts/*"],
-            "constants/*": ["src/constants/*"],
-            "apis/*": ["src/apis/*"],
-            "actions/*": ["src/actions/*"],
-            "selectors/*": ["src/selectors/*"]
-=======
             "selectors/*": ["src/selectors/*"],
             "utils/*": ["src/utils/*"]
->>>>>>> upstream/dev
         }
     },
     "exclude": ["node_modules", "dist"]

diff --git a/package.json b/package.json
@@ -30,16 +30,8 @@
       "^contexts(.*)": "<rootDir>/src/contexts$1",
       "^graphql(.*)": "<rootDir>/src/graphql$1",
       "^hooks(.*)": "<rootDir>/src/hooks$1",
-<<<<<<< HEAD
-      "^contexts(.*)": "<rootDir>/src/contexts$1",
-      "^constants(.*)": "<rootDir>/src/constants$1",
-      "^apis(.*)": "<rootDir>/src/apis$1",
-      "^actions(.*)": "<rootDir>/src/actions$1",
-      "^selectors(.*)": "<rootDir>/src/selectors$1"
-=======
       "^selectors(.*)": "<rootDir>/src/selectors$1",
       "^utils(.*)": "<rootDir>/src/utils$1"
->>>>>>> upstream/dev
     }
   },
   "devDependencies": {

diff --git a/src/razzle-plugins/alias.js b/src/razzle-plugins/alias.js
@@ -15,13 +15,6 @@ module.exports = config => {
     contexts: path.resolve('./src/contexts'),
     graphql: path.resolve('./src/graphql'),
     hooks: path.resolve('./src/hooks'),
-<<<<<<< HEAD
-    contexts: path.resolve('./src/contexts'),
-    constants: path.resolve('./src/constants'),
-    apis: path.resolve('./src/apis'),
-    actions: path.resolve('./src/actions'),
-=======
->>>>>>> upstream/dev
     selectors: path.resolve('./src/selectors'),
     utils: path.resolve('./src/utils'),
   };