diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7c59b118d1357eb6c7b2b529c50b729e0f1c7b09..e75edf2dabe6dead528a26b9b73267661cd2751a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -49,7 +49,6 @@
 	* java/math/BigDecimal.java (BigDecimal(double)): Rewrote.
 	(BigDecimal(String)): Likewise.
 
->>>>>>> 1.1022
 2001-11-19  Tom Tromey  <tromey@redhat.com>
 
 	* verify.cc (_Jv_BytecodeVerifier::branch_prepass) [op_iinc]: