From 2256a8d509a33fa9b10aa0ec43373e48548c6835 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 30 Mar 2011 17:01:06 +0100 Subject: [PATCH] Merge conflict: resolve. --- Documentation/web/news-front.itexi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index 41b77d46d2..ffb32e19e0 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -19,11 +19,7 @@ listed in the @qq{Changes} manual on the website section about There are no known Critical issues with this release. If no Critical bugs are found, then the official 2.14.0 release will be -<<<<<<< HEAD on April 5, 2011. If you discover any problems, please send us -======= -on April 2, 2011. If you discover any problems, please send us ->>>>>>> release/unstable @ref{Bug reports}. @newsEnd -- 2.39.5