resolve merge conflicts

This commit is contained in:
Johnny Amancio
2026-07-14 13:03:25 +02:00
907 changed files with 37605 additions and 31921 deletions
@@ -8,9 +8,6 @@ import { ServerAuth } from "../../src/server/auth"
import { PtyID } from "@opencode-ai/core/pty/schema"
import { resetDatabase } from "../fixture/db"
import { disposeAllInstances, tmpdir } from "../fixture/fixture"
import * as Log from "@opencode-ai/core/util/log"
void Log.init({ print: false })
function app(input: { password?: string; username?: string }) {
const handler = HttpRouter.toWebHandler(