From 46fcabbc893d3c18db603436161daf57bde4883b Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Fri, 16 Apr 2004 20:38:52 +0100
Subject: [PATCH] Remove conflict indicators.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d425a4b268e..bdca2372895 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -264,7 +264,6 @@
 	* java/applet/Applet.java (getPreferredSize): New method.
 	(getMinimumSize): New method.
 
->>>>>>> 1.2732
 2004-04-15  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* prims.cc (_Jv_AllocObject): Remove `size' argument.