From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 22 Dec 2013 13:30:41 +0000 (+0000)
Subject: fix news
X-Git-Tag: php-5.6.0alpha1~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee55edf5e41b695f781d36a808664e42d6a3dcd0;p=php

fix news
---

diff --git a/NEWS b/NEWS
index 1f971a0223..fecf78ceb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-<<<<<<< HEAD
 ?? ??? 20??, PHP 5.6.0 
-=======
-?? ??? 2013, PHP 5.5.8
 
 - Core:
   . Disallowed JMP into a finally block. (Laruence)