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

Fix detection of conflicting module files #307

Merged
merged 3 commits into from Jan 6, 2020
Merged

Conversation

@takluyver
Copy link
Owner

takluyver commented Jan 4, 2020

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 merged commit 9d072eb into master Jan 6, 2020
6 checks passed
6 checks passed
codecov/patch 100% of diff hit (target 86.31%)
Details
codecov/project 86.36% (+0.05%) compared to 5f5a9ba
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@takluyver takluyver deleted the conflicting-modules branch Jan 6, 2020
@takluyver

This comment has been minimized.

Copy link
Owner Author

takluyver commented Jan 6, 2020

Thanks for checking it, @uranusjr :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.