resolved conflict

NoroffFEU · Sep 6, 2023 · c981be9 · c981be9
2 parents a26196b + ffe47d7
commit c981be9
Show file tree

Hide file tree

Showing 5 changed files with 3,679 additions and 15,866 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,24 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true,
-    "node": true
-  },
-  "extends": "eslint:recommended",
-  "overrides": [
-    {
-      "files": ["**/*.cy.js"],
-      "env": { "cypress/globals": true },
-      "plugins": ["cypress"],
-      "extends": ["plugin:cypress/recommended"],
-      "rules": {
-        "cypress/no-unnecessary-waiting": "off",
-        "no-unused-vars": "off"
-      }
-    }
-  ],
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  }
-}

diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+# social-media-client