chore: fix conflict

aibayanyu20 · aibayanyu20 · commit 2390912ea7b4 · 2023-08-22T23:41:00.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -82,6 +82,8 @@ web_modules/
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache
+.idea
+.vscode
 
 # Next.js build output
 .next
diff --git a/package.json b/package.json
@@ -48,4 +48,4 @@
     "nuxt": "^3.5.1",
     "vitest": "^0.31.1"
   }
-}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
