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.