fix news file

diff --git a/NEWS b/NEWS
index 51361215cb7bfb6f9613b7fb0fbc61ab6e2008a5..6bb92f7905aedc3a5576d5a30ae85c7e1ecd74fa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-<<<<<<< HEAD
 ?? ??? 20??, PHP 5.7.0 
-=======
-<<<<<<< HEAD
-?? ??? 20??, PHP 5.6.0 
-=======
-?? ??? 2013, PHP 5.5.8
 
 - Core:
   . Disallowed JMP into a finally block. (Laruence)