Resolved apperent cvs commit confict.

diff --git a/NEWS b/NEWS
index 43c717f057d1801a22a68d13558fe2581c1191bd..3ff9dd74adfe2d71de5a19c4d95fcdebfa639724 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,11 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ? ? ??? 200?, Version 4.4.0
-<<<<<<< NEWS
 - Make uniqid() parameters optional and allow any prefix length. (Marcus)
-=======
 - New range() functionality
   . Support for float modifier.
   . Detection of numeric values inside strings passed as high & low.
   . Proper handle the situations where high == low.
->>>>>>> 1.1286
 - Let array_search() accept objects as a needle under ZendEngine2. (Moriyoshi)
 - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia)
 - Added imagefilter() function which allows application of various filters.