Skip to content

Conversation

@blueyed
Copy link
Contributor

@blueyed blueyed commented Feb 22, 2020

Originally added in a289142 (with TestRootdir), but then
accidentally moved to TestOverrideIniArgs in 802755c.

Originally added in a289142 (with `TestRootdir`), but then
accidentally moved to `TestOverrideIniArgs` in 802755c.
@blueyed
Copy link
Contributor Author

blueyed commented Feb 22, 2020

@nicoddemus please consider leaving the "conflicts" comment with merge commits in the future - assuming that this was another wrongly resolved conflict.

@blueyed blueyed merged commit bfd0d18 into pytest-dev:master Feb 23, 2020
@blueyed blueyed deleted the tests-cleanup branch February 23, 2020 16:12
aklajnert pushed a commit to aklajnert/pytest that referenced this pull request Feb 27, 2020
Originally added in a289142 (with `TestRootdir`), but then
accidentally moved to `TestOverrideIniArgs` in 802755c.
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