Skip to content

fix: resolve merge conflict in api.ts and Prettier formatting#54

Merged
jp-bmn merged 1 commit into
mainfrom
fix/build-prettier-conflict
Jun 30, 2026
Merged

fix: resolve merge conflict in api.ts and Prettier formatting#54
jp-bmn merged 1 commit into
mainfrom
fix/build-prettier-conflict

Conversation

@m1lestones

Copy link
Copy Markdown
Collaborator

Summary

  • Resolved git merge conflict in api.ts (kept Joel's getAuthTokenAction for server-side auth)
  • Fixed Prettier formatting in login/page.tsx, UserProvider.tsx, api.ts, middleware.ts, layout.tsx, signals_dump.json, BUILD_SUMMARY.md to unblock CI

Test plan

  • CI format check passes
  • Local build compiles without errors

@m1lestones m1lestones requested a review from jp-bmn as a code owner June 30, 2026 00:19
@vercel

vercel Bot commented Jun 30, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
adonisagent-web Ready Ready Preview, Comment Jun 30, 2026 12:19am

@jp-bmn jp-bmn merged commit 1541cf0 into main Jun 30, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants