Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Custom title pr 968 #1475

Merged
merged 18 commits into from
Jul 11, 2022
Merged

Custom title pr 968 #1475

merged 18 commits into from
Jul 11, 2022

Conversation

EmmaDawsonDev
Copy link
Member

@EmmaDawsonDev EmmaDawsonDev commented Jul 11, 2022

Fixes Issue #964

The creator of PR #968 never came back to fix a merge conflict although the changes were very good. Instead I created a new branch, merged their changes there and fixed the conflicting files (package-lock.json). I have also merged in all current changes since the PR was from January. Prettier has adjusted some of the files, but the main changes were to the user profile.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

It's great having you contribute to this project

Welcome to the community 🤓

If you would like to continue contributing to open source and would like to do it with an awesome inclusive community, you should join our Discord chat and our GitHub Organisation - we help and encourage each other to contribute to open source little and often 🤓 . Any questions let us know.

src/Components/UserProfile/User.js Outdated Show resolved Hide resolved
src/Components/UserProfile/User.js Outdated Show resolved Hide resolved
EmmaDawsonDev and others added 2 commits July 11, 2022 13:17
Co-authored-by: Tom Schmelzer <30869493+schmelto@users.noreply.github.com>
Co-authored-by: Tom Schmelzer <30869493+schmelto@users.noreply.github.com>
@EmmaDawsonDev
Copy link
Member Author

Well spotted Tom, updated it now.

Copy link
Contributor

@schmelto schmelto left a comment

Choose a reason for hiding this comment

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

Looking good to me

Your suggested changes looking good to me.
__
sema-logo  Summary: 👌 This code looks good  |  Tags: Elegant

Copy link
Member

@eddiejaoude eddiejaoude left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@EmmaDawsonDev EmmaDawsonDev merged commit 6f52af9 into main Jul 11, 2022
@EmmaDawsonDev EmmaDawsonDev deleted the customTitlePR branch July 11, 2022 14:21
This was referenced Jul 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants