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 failing tests rebased for the dev branch #1372

Merged
merged 7 commits into from
Sep 9, 2020

Conversation

drvinceknight
Copy link
Member

@drvinceknight drvinceknight commented Sep 9, 2020

This is a rebase of #1371 on to the dev branch. After #1367 and #1368 were merged the dev branch now includes information about the branching strategy in the docs (#1367) and has been formatted with black (#1368).

It would be preferable to merge this PR and close #1371. Then we would be able to stop using the master branch and set the default branch to dev going forward.

@drvinceknight drvinceknight force-pushed the fix-failing-tests-from-spitefullCC-for-dev branch from f3ac8eb to a3315cd Compare September 9, 2020 13:10
@Nikoleta-v3 Nikoleta-v3 merged commit e175c73 into dev Sep 9, 2020
@drvinceknight
Copy link
Member Author

Thanks for merging @Nikoleta-v3, I'll change the default branch to dev 👍

@marcharper marcharper deleted the fix-failing-tests-from-spitefullCC-for-dev branch July 3, 2022 18:03
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

4 participants