Fix CHANGELOG merge

This commit is contained in:
Bruno Oliveira 2015-12-10 19:40:45 -02:00
parent 8b61a332ba
commit 8f880e1625
1 changed files with 1 additions and 4 deletions

View File

@ -14,8 +14,7 @@
* New `-rp` and `-rP` reporting options give the summary and full output * New `-rp` and `-rP` reporting options give the summary and full output
of passing tests, respectively. Thanks to David Vierra for the PR. of passing tests, respectively. Thanks to David Vierra for the PR.
2.8.2.dev
---------
2.8.5.dev0 2.8.5.dev0
---------- ----------
@ -75,8 +74,6 @@
system integrity protection (thanks Florian) system integrity protection (thanks Florian)
2.8.2 2.8.2
----- -----