From 224c4888946357ac9643ba9b00ee07281e7a0cc8 Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Mon, 4 Mar 2002 01:01:08 +0000
Subject: [PATCH] Remove cvs junk

From-SVN: r50271
---
 libjava/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ed0b35ce06d..afadd005f9f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -27,7 +27,6 @@
 	* configure: Rebuilt.
 	* configure.in (GCJVERSION): Removed.
 
->>>>>>> 1.1201
 2002-02-26  Andreas Schwab  <schwab@suse.de>
 
 	* acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of