Skip to content

Fix flake8: os imported, but unused#4231

Merged
blueyed merged 1 commit intopytest-dev:masterfrom
blueyed:fix-master
Oct 24, 2018
Merged

Fix flake8: os imported, but unused#4231
blueyed merged 1 commit intopytest-dev:masterfrom
blueyed:fix-master

Conversation

@blueyed
Copy link
Contributor

@blueyed blueyed commented Oct 24, 2018

Likely due to b6fa4e2.

@blueyed blueyed merged commit 15278aa into pytest-dev:master Oct 24, 2018
@blueyed blueyed deleted the fix-master branch October 24, 2018 21:47
@asottile
Copy link
Member

implicit conflict between these comits: 86c7dcf (moved the import) 956b3ac (removed the import)

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.

2 participants