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

Review of points chapter #135

Merged
merged 5 commits into from
Feb 2, 2021
Merged

Review of points chapter #135

merged 5 commits into from
Feb 2, 2021

Conversation

darribas
Copy link
Member

Not to merge yet but to keep track of progress.

@darribas darribas added the WIP work in progress, do not merge - for discussion only label Jan 22, 2021
@darribas darribas mentioned this pull request Jan 22, 2021
@darribas darribas changed the title [WIP] Review of points chapter Review of points chapter Jan 27, 2021
@darribas
Copy link
Member Author

OK, this is good to go AFAIC!

@darribas darribas removed the WIP work in progress, do not merge - for discussion only label Jan 27, 2021
Copy link
Member

@ljwolf ljwolf left a comment

Choose a reason for hiding this comment

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

I think we need to separate the changes to the points chapter from the changes elsewhere. It looks like the current PR is not mergable because of this...

The only issue was the versioning in the spatial inequality notebook.
I've updated the version there, and it should be fine now.
@ljwolf
Copy link
Member

ljwolf commented Feb 2, 2021

@darribas, I believe I've addressed the merge conflicts. I'll merge now.

@ljwolf ljwolf merged commit 1d02f82 into gdsbook:master Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants