fix news

diff --git a/NEWS b/NEWS
index 6bb92f7905aedc3a5576d5a30ae85c7e1ecd74fa..a1635d7817d7730177fd394aed32ca0e1841f231 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -60,8 +60,6 @@ PHP                                                                        NEWS
   . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
 
 12 Dec 2013, PHP 5.5.7
->>>>>>> PHP-5.5
->>>>>>> PHP-5.6
 
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)