Skip to content

Commit

Permalink
Merge pull request #3093 from cryvate/fix-issue-2985-blurb
Browse files Browse the repository at this point in the history
Fix issue 2985 blurb in changelog
  • Loading branch information
nicoddemus authored Jan 7, 2018
2 parents 29ff930 + d7e1f03 commit 794fb19
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ Bug Fixes
by the garbage collector. (`#2981
<https://github.com/pytest-dev/pytest/issues/2981>`_)

- Fix conversion of pyargs to filename to not convert symlinks and not use
deprecated features on Python 3. (`#2985
- Fix conversion of pyargs to filename to not convert symlinks on Python 2. (`#2985
<https://github.com/pytest-dev/pytest/issues/2985>`_)

- ``PYTEST_DONT_REWRITE`` is now checked for plugins too rather than only for
Expand Down

0 comments on commit 794fb19

Please sign in to comment.