diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 01ad71a5010..193607a6d9b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -106,7 +106,6 @@
 	* java/lang/natObject.cc: Move thread synchronization primitives to
 	system-dependent headers.
 
->>>>>>> 1.1231
 2002-03-09  Adam Megacz  <adam@xwt.org>
 
         * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero