com php-src: fix news: NEWS
| From: | Joe Watkins | Date: | Sun, 22 Dec 2013 13:30:41 +0000 |
| Subject: | com php-src: fix news: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75403@lists.php.net to get a copy of this message | ||
Commit: ee55edf5e41b695f781d36a808664e42d6a3dcd0
Author: krakjoe <joe.watkins@live.co.uk> Sun, 22 Dec 2013 13:30:41 +0000
Parents: d455377fad13156b85db957a9419d7aefcbc0040
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee55edf5e41b695f781d36a808664e42d6a3dcd0
Log:
fix news
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 1f971a0..fecf78c 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)