From 0ffda3cc491c87db261f8e7881cfe93debc27f93 Mon Sep 17 00:00:00 2001
From: Andrei Zmievski <andrei@php.net>
Date: Sat, 17 Jun 2000 18:32:53 +0000
Subject: [PATCH] Relic from cvs conflict?

---
 NEWS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e6689ee255b..68a05698f42 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,7 @@ PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ??? 2000, Version 4.0.1
-<<<<<<< NEWS
-- Added restore_error_handler()
+- Added restore_error_handler(). (Zeev, Zend engine)
 - Fixed erroneous file names and line numbers in error situations under the
   multithreaded version of PHP - most noticeably Win32 (Zeev, Zend Engine)
 - Fix problem with CGI crashing on certain servers especially Windows Apache