1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 061d3e05d7..3cc4dd5b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,6 @@ Tue Feb 16 23:42:51 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
 	* configure.in: FreeBSD objformat patch
 
->>>>>>> 1.1.1.2.2.163
 Tue Feb 16 12:40:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* version 1.2.3 (stable) released.