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

fix news file
---

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