FIXED merge conflicts#72
Merged
mr-jones123 merged 14 commits intoFEUTechACMX:AboutPagefrom Jan 14, 2025
Merged
Conversation
…it would stick to all pages under the aboutpage.
… the meet the team section. Ongoing component implementation
|
@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. |
Collaborator
Author
|
Working demo of the site 20250114-1100-18.3004123.mp4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixed the previous merge conflict. Refer to this closed issue
#71