1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2d79ee531..95417faa1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -298,7 +298,6 @@
 
 	* elf/tls-macros.h: Correct typo.
 
->>>>>>> 1.9308
 2005-03-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* nis/ypclnt.c (yp_2_yperr): Revert 2004-11-30 patch.