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

Remove merge-conflict marker merged by accident 

Unfortunately rst-lint didn't catch that
This commit is contained in:
Bruno Oliveira 2016-08-23 23:42:16 -03:00
parent 6359894fe4
commit c5675d3efc
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -46,7 +46,6 @@
.. _#1832: https://github.com/pytest-dev/pytest/issues/1832
.. _#1849: https://github.com/pytest-dev/pytest/issues/1849
>>>>>>> master
3.0.0
=====