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.

Sign up for GitHub

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

Jump to bottom

Remove merge conflict markers #261

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Remove merge conflict markers #261

merged 1 commit into from
Oct 4, 2023

Conversation

lochhh
Copy link
Contributor

@lochhh lochhh commented Sep 25, 2023 •
edited
Loading

Removed merge conflict markers by checking out the last good commit for the following files:

and re-ran pre-commit.

Fixes #259

@jkbhagatio jkbhagatio self-requested a review October 4, 2023 22:08
jkbhagatio
jkbhagatio approved these changes Oct 4, 2023
View reviewed changes
Copy link
Member

@jkbhagatio jkbhagatio left a comment

Choose a reason for hiding this comment

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

lgtm!

@jkbhagatio jkbhagatio merged commit b559978 into SainsburyWellcomeCentre:main Oct 4, 2023
5 of 7 checks passed
@lochhh lochhh deleted the remove-merge-conflict-markers branch October 6, 2023 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkbhagatio jkbhagatio jkbhagatio approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge conflict markers need to be removed
2 participants
@lochhh @jkbhagatio