summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-04-01 16:11:45 +0000
committerJakub Jelinek <jakub@redhat.com>2005-04-01 16:11:45 +0000
commitd1a01a8176a6e30f397191fcb039cfd342face0f (patch)
tree0659e7b771b331ce7bba3b808d353e23c24ab9b6 /ChangeLog
parente8eaba2b25948c0e60f70c33c5c52aad70bbf5fc (diff)
2.3.4-19
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
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.