p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge in CHANGELOG

This commit is contained in:
Bruno Oliveira 2016-06-26 21:18:01 +02:00
parent e2f550156e
commit 22c2d87633
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.rst
View File

@ -54,11 +54,8 @@
.. _#1553: https://github.com/pytest-dev/pytest/issues/1553
.. _#1626: https://github.com/pytest-dev/pytest/pull/1626
.. _#1503: https://github.com/pytest-dev/pytest/issues/1503
<<<<<<< HEAD
.. _#1479: https://github.com/pytest-dev/pytest/issues/1479
=======
.. _#925: https://github.com/pytest-dev/pytest/issues/925
>>>>>>> Improve of the test output for logical expression with brackets.
.. _@graingert: https://github.com/graingert
.. _@taschini: https://github.com/taschini