From f0adc5b2e4c07dcb600307b140f50b1c2b282e4c Mon Sep 17 00:00:00 2001
From: mirarifhasan <arif.ishan05@gmail.com>
Date: Thu, 22 Feb 2024 13:38:54 +0600
Subject: [PATCH] chore: rebased and resolve conflicts

---
 packages/hoppscotch-backend/src/infra-config/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hoppscotch-backend/src/infra-config/helper.ts b/packages/hoppscotch-backend/src/infra-config/helper.ts
index 8f460efa8..dcbae99dc 100644
--- a/packages/hoppscotch-backend/src/infra-config/helper.ts
+++ b/packages/hoppscotch-backend/src/infra-config/helper.ts
@@ -164,7 +164,7 @@ export async function isInfraConfigTablePopulated(): Promise<boolean> {
   const prisma = new PrismaService();
   try {
     const dbInfraConfigs = await prisma.infraConfig.findMany();
-    const infraConfigDefaultObjs = getDefaultInfraConfigs();
+    const infraConfigDefaultObjs = await getDefaultInfraConfigs();
 
     const propsRemainingToInsert = infraConfigDefaultObjs.filter(
       (p) => !dbInfraConfigs.find((e) => e.name === p.name),