com php-src: fix news file: NEWS
| From: | Joe Watkins | Date: | Sun, 22 Dec 2013 13:27:38 +0000 |
| Subject: | com php-src: fix news file: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75402@lists.php.net to get a copy of this message | ||
Commit: 523a6b50aeef9b9c005dd18eddbaeb47ce40e6cf
Author: krakjoe <joe.watkins@live.co.uk> Sun, 22 Dec 2013 13:27:38 +0000
Parents: 8ce521a6a7ea9779cc30c4b404d4f7b38b59f096
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=523a6b50aeef9b9c005dd18eddbaeb47ce40e6cf
Log:
fix news file
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 5136121..6bb92f7 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)