From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Fri, 16 Apr 2004 19:38:52 +0000 (+0100)
Subject: Remove conflict indicators.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46fcabbc893d3c18db603436161daf57bde4883b;p=gcc.git

Remove conflict indicators.

From-SVN: r80767
---

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.