Skip to content

FIXED merge conflicts#72

Merged
mr-jones123 merged 14 commits intoFEUTechACMX:AboutPagefrom
arrogance231:AboutPage
Jan 14, 2025
Merged

FIXED merge conflicts#72
mr-jones123 merged 14 commits intoFEUTechACMX:AboutPagefrom
arrogance231:AboutPage

Conversation

@arrogance231
Copy link
Collaborator

Fixed the previous merge conflict. Refer to this closed issue

#71

@vercel
Copy link

vercel bot commented Jan 14, 2025

@arrogance231 is attempting to deploy a commit to the FEU Tech ACMX's projects Team on Vercel.

A member of the Team first needs to authorize it.

@arrogance231
Copy link
Collaborator Author

Working demo of the site

20250114-1100-18.3004123.mp4

@arrogance231 arrogance231 changed the base branch from master to AboutPage January 14, 2025 11:23
@mr-jones123 mr-jones123 merged commit 2f1a737 into FEUTechACMX:AboutPage Jan 14, 2025
1 check failed
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.

6 participants