chore: resolved all merge conflicts

2023-01-24 19:35:40 +05:30
parent 93479320ee 648637a1a1
commit ca4c576f78
31 changed files with 2864 additions and 14 deletions
--- a/packages/hoppscotch-backend/package.json
+++ b/packages/hoppscotch-backend/package.json
@@ -112,4 +112,4 @@
    "coverageDirectory": "../coverage",
    "testEnvironment": "node"
  }
-}
+}