fix conflicts?

This commit is contained in:
John Yeo
2026-05-17 10:38:32 +01:00
3 changed files with 5 additions and 9 deletions

2
.gitignore vendored
View File

@@ -153,3 +153,5 @@ server/.turbo
./AGENTS.md ./AGENTS.md
./CLAUDE.md ./CLAUDE.md
notes.txt

2
ai

Submodule ai updated: 63a34aaa16...bf528179eb

View File

@@ -41,13 +41,7 @@
// Explicitly set drizzle-orm path to avoid monorepo issues // Explicitly set drizzle-orm path to avoid monorepo issues
"drizzle-orm": ["../node_modules/drizzle-orm"], "drizzle-orm": ["../node_modules/drizzle-orm"],
"drizzle-orm/*": ["../node_modules/drizzle-orm/*"], "drizzle-orm/*": ["../node_modules/drizzle-orm/*"]
"@better-auth/core": ["../node_modules/@better-auth/core"],
"@better-auth/core/*": ["../node_modules/@better-auth/core/*"],
"hono": ["../node_modules/hono"],
"hono/*": ["../node_modules/hono/*"]
} }
}, },
"include": ["src", "tests", "scripts", "experiments", "perf"], "include": ["src", "tests", "scripts", "experiments", "perf"],