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

fix merge confict mistakes from CI cleanup #230

Merged
merged 14 commits into from
Mar 22, 2023
Merged

fix merge confict mistakes from CI cleanup #230

merged 14 commits into from
Mar 22, 2023

Conversation

MatthewSteen
Copy link
Member

@MatthewSteen MatthewSteen commented Mar 9, 2023 •
edited
Loading

When I was resolving the merge conflicts in the CI cleanup PR #224, I mistakenly removed the following PR changes. So, this PR restores those.

gtfierro
gtfierro reviewed Mar 9, 2023
View reviewed changes
Copy link
Collaborator

@gtfierro gtfierro left a comment

Choose a reason for hiding this comment

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

Looks like the README disappeared in this one?

I'll need to take a closer look at the rest but this seems pretty good. Thanks for taking the time to go through and help fix this!

@MatthewSteen
Copy link
Member Author

Yes the root README was removed in #223.

@MatthewSteen MatthewSteen requested a review from gtfierro March 17, 2023 20:16
@MatthewSteen MatthewSteen merged commit d9a7dca into develop Mar 22, 2023
@MatthewSteen MatthewSteen deleted the ci-cleanup branch March 22, 2023 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haneslinger haneslinger haneslinger approved these changes

@gtfierro gtfierro Awaiting requested review from gtfierro

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

Successfully merging this pull request may close these issues.
3 participants
@MatthewSteen @gtfierro @haneslinger