fix: resolve stash conflict markers in AGENTS.md, zopu.ts, package.json, bun.lock
All four files had unresolved git stash-pop conflict markers baked in. - AGENTS.md: keep ours (docs/ canonical reference) - zopu.ts: keep ours (authenticatedAgentRoute) - package.json: keep ours (catalog: convention) - bun.lock: restore clean version from pre-damage commit
This commit is contained in:
@@ -15,11 +15,7 @@
|
||||
"@code/backend": "workspace:*",
|
||||
"@code/env": "workspace:*",
|
||||
"@flue/runtime": "latest",
|
||||
<<<<<<< Updated upstream
|
||||
"@rivet-dev/agentos-core": "catalog:",
|
||||
=======
|
||||
"@rivet-dev/agentos-core": "^0.2.10",
|
||||
>>>>>>> Stashed changes
|
||||
"convex": "catalog:",
|
||||
"hono": "4.12.30",
|
||||
"valibot": "^1.4.2"
|
||||
|
||||
Reference in New Issue
Block a user