From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 22 Dec 2013 14:34:29 +0000 (+0000)
Subject: fix news
X-Git-Tag: PRE_PHPNG_MERGE~353^2~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=befdd1770ae3309288590118f4f283acf54b9f3b;p=php

fix news
---

diff --git a/NEWS b/NEWS
index 6bb92f7905..a1635d7817 100644
--- 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)