These shouldn't be here

diff --git a/ChangeLog b/ChangeLog
index 4fcab86c162ee26326882d389fe53de61a3c57b4..b5de2e8d79f69ccd6aed4c39de3b77afe3a7522a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ?? 1999, Version 4.0 Beta 3
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
 - Renamed allow_builtin_links to expose_php (defaults to On).  This directive
   tells PHP whether it may expose its existence to the outside world, e.g.
   by adding itself to the Web server header (Zeev)