Skip to content

Complete Update Release for the Official Version -- ScripticX Platform - #2

Merged
Sank34 merged 31 commits into
mainfrom
maintenance/admin-panel-revamp
Sep 13, 2026
Merged

Sank34 merged 31 commits into
mainfrom
maintenance/admin-panel-revamp

Conversation

@Sank34

@Sank34 Sank34 commented Sep 13, 2026

Copy link
Copy Markdown
Owner

No description provided.

@vercel

vercel Bot commented Sep 13, 2026 •

Copy link
Copy Markdown

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

Project Deployment Actions Updated
scripticx Ready Ready Preview Sep 13, 2026 11:09am UTC

Request Review

@Sank34

Sank34 commented Sep 13, 2026

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

…el-revamp

# Conflicts:
#	README.md
#	app/admin/problems/[id]/page.tsx
#	app/admin/problems/page.tsx
#	app/editor/page.tsx
#	app/live/[roomId]/page.tsx
#	app/problems/[id]/page.tsx
#	app/problems/page.tsx
#	components/admin/ProblemForm.tsx
#	lib/i18n.ts

Co-authored-by: Sank34 <71709931+Sank34@users.noreply.github.com>

Copilot AI commented Sep 13, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved. I merged main into this branch and completed conflict resolution in commit 0673edf.

@Sank34
Sank34 merged commit ea1216b into main Sep 13, 2026
2 of 3 checks passed
@Sank34
Sank34 deleted the maintenance/admin-panel-revamp branch September 13, 2026 11:10

This branch was successfully deployed

1 active deployment
Preview — 0673edf0 Deployed Sep 13, 2026 by vercel[bot]
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.

3 participants