Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Banner and logo added to dashboard #91

Merged
merged 2 commits into from
Aug 15, 2024

Conversation

LiamB94
Copy link
Collaborator

@LiamB94 LiamB94 commented Aug 14, 2024

Added banner implemtation to dashboard and a png of the logo
closes #33 and #86

@LiamB94 LiamB94 self-assigned this Aug 14, 2024
@vonner04
Copy link
Collaborator

vonner04 commented Aug 14, 2024

Lgtm.

Copy link
Collaborator

@vonner04 vonner04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think to resolve the merge conflicts for Dashboard.jsx you can just add both imports from banner-implementation and main. I'm not too sure with the package-lock.json file.

Copy link

@Taks07
Copy link
Collaborator

Taks07 commented Aug 15, 2024

@vonner04 ive tried fixing the conflicts

@vonner04 vonner04 merged commit 5218708 into Taks0708:main Aug 15, 2024
2 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.

Create Website Header
3 participants