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 detection of conflicting module files #307

Merged
merged 3 commits into from Jan 6, 2020
Merged

Fix detection of conflicting module files #307

merged 3 commits into from Jan 6, 2020

Conversation

takluyver
Copy link
Member

The code to check for this was already there, but because we were using elif in place of if, it could never actually fire.

Fixing this revealed that there was a conflict in the test sample files, which also needed to be cleaned up.

@takluyver takluyver mentioned this pull request Jan 6, 2020
Closed
@takluyver takluyver merged commit 9d072eb into master Jan 6, 2020
@takluyver takluyver deleted the conflicting-modules branch January 6, 2020 10:25
@takluyver
Copy link
Member Author

Thanks for checking it, @uranusjr :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

None yet
2 participants
@takluyver @uranusjr