From ed343779f43f00bfe1196e37ece5878eaf58af2e Mon Sep 17 00:00:00 2001
From: Neil Booth <neil@gcc.gnu.org>
Date: Sat, 8 Apr 2000 05:03:43 +0000
Subject: [PATCH] Correct merge conflict

From-SVN: r33020
---
 gcc/testsuite/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f31f1afb0c0..6602129ede9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-08  Neil Booth  <NeilB@earthling.net>
+	
+	* gcc.dg/cpp-nullchar.c: Remove test as
+	embedded nulls cause problems.
+
 2000-04-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.dg/compare2.c: New test.
-- 
2.30.2