From ebe402a9c33661c961093555ed52e8401bbd25c1 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Fri, 27 Dec 2002 01:32:47 +0000
Subject: [PATCH] NEWS update

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 5eca6d08ac..43c717f057 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,14 @@
 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.
-- 
2.50.1