From 8f880e1625d6ded14747ad4bf86ec8e23fe3716e Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 10 Dec 2015 19:40:45 -0200 Subject: [PATCH] Fix CHANGELOG merge --- CHANGELOG | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1da8638b3..fb08823f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,8 +14,7 @@ * New `-rp` and `-rP` reporting options give the summary and full output of passing tests, respectively. Thanks to David Vierra for the PR. -2.8.2.dev ---------- + 2.8.5.dev0 ---------- @@ -75,8 +74,6 @@ system integrity protection (thanks Florian) - - 2.8.2 -----