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

Correct ReStructuredText inline literal syntax in CONTRIBUTING.rst #798

Merged
merged 1 commit into from
Jan 17, 2019
Merged

Correct ReStructuredText inline literal syntax in CONTRIBUTING.rst #798

merged 1 commit into from
Jan 17, 2019

Conversation

jdufresne
Copy link
Contributor

No description provided.

@sigmavirus24
Copy link
Member

Please rebase

@jdufresne
Copy link
Contributor Author

Rebased, thanks.

asottile
asottile approved these changes Jan 17, 2019
View reviewed changes
Copy link
Member

@asottile asottile left a comment

Choose a reason for hiding this comment

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

conflicting again, but change looks good

@jdufresne
Copy link
Contributor Author

Thanks. Rebased.

@asottile
Copy link
Member

looks like you accidentally committed the patch conflict file (.orig)

@jdufresne
Copy link
Contributor Author

Whoops, thanks for catching. Fixed now.

asottile
asottile approved these changes Jan 17, 2019
View reviewed changes
Copy link
Member

@asottile asottile left a comment

Choose a reason for hiding this comment

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

@sigmavirus24 sigmavirus24 merged commit 9f8240e into PyCQA:master Jan 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asottile asottile asottile 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
@jdufresne @sigmavirus24 @asottile