Merge conflict: resolve.

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 41b77d46d20efb513437cea0828a1a697b88074d..ffb32e19e0787a0ed05a823d16298d71bb9179e1 100644 (file)
--- 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