merge conflicts

This commit is contained in:
Dhravya 2024-06-30 20:50:24 -05:00
commit ffd141ade4
34 changed files with 1012 additions and 256 deletions

View file

@ -18,7 +18,8 @@
"**/*.tsx",
".next/types/**/*.ts",
"../../packages/ui/",
"../../packages/shared-types/utils.ts"
"../../packages/shared-types/utils.ts",
"./components"
],
"exclude": ["node_modules/"]
}