Skip to content

Fix-up some merge conflicts and typos that snuck into docs #129

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
Merged
merged 1 commit into from
Jul 22, 2022
Merged

Fix-up some merge conflicts and typos that snuck into docs #129

merged 1 commit into from
Jul 22, 2022

Conversation

@mjrousos
Copy link
Member

@mjrousos mjrousos commented Jul 22, 2022

No description provided.

@mjrousos mjrousos requested a review from twsouthwick July 22, 2022 21:41
twsouthwick
twsouthwick approved these changes Jul 22, 2022
View reviewed changes
Copy link
Member

@twsouthwick twsouthwick left a comment

Choose a reason for hiding this comment

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

Oh that's weird. Last time I use vs code for merge conflict resolution!

@mjrousos mjrousos enabled auto-merge (squash) July 22, 2022 21:43
@mjrousos mjrousos merged commit d99901f into main Jul 22, 2022
@mjrousos mjrousos deleted the mjrousos/doc-fix branch July 22, 2022 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@twsouthwick twsouthwick twsouthwick 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.

3 participants

@mjrousos @twsouthwick