From: Edin Kadribasic <edink@php.net>
Date: Fri, 27 Dec 2002 02:55:37 +0000 (+0000)
Subject: Resolved apperent cvs commit confict.
X-Git-Tag: PHP_5_0_dev_before_13561_fix~598
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3c2f80d72c0921a67d8cd529ad49bc46dac428c;p=php

Resolved apperent cvs commit confict.
---

diff --git a/NEWS b/NEWS
index 43c717f057..3ff9dd74ad 100644
--- 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.