From 5b6cc55cb5abe79a456035bd215836e48dd96a28 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 6 Sep 2003 09:56:57 +0000
Subject: Update.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9040a40af2..35097f1d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,7 +37,6 @@
 	* sysdeps/mach/hurd/mmap.c (__mmap): If io_map fails with MIG_BAD_ID,
 	EOPNOTSUPP, or ENOSYS, change it to ENODEV.
 
->>>>>>> 1.7905
 2003-09-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/sigstack.h (MINSIGSTKSZ):
-- 
cgit v1.2.3