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.

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

Contributing and style #367

Merged
merged 8 commits into from
Mar 22, 2018

Conversation

pdebuyl
Copy link
Member

@pdebuyl pdebuyl commented Mar 21, 2018

See #146

@vahtras
Copy link
Contributor

vahtras commented Mar 22, 2018

Great, but is now in conflict with previous merge that has to be resolved first.

@pdebuyl
Copy link
Member Author

pdebuyl commented Mar 22, 2018

All conflicts are resolved as far as I (and the GitHub diagnostic) can tell :-)

@vahtras vahtras merged commit 6d29b00 into scipy-lectures:2017.1.1 Mar 22, 2018
@pdebuyl pdebuyl deleted the contributing_and_style branch March 22, 2018 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants