Fix wrong ChangeLog merge

diff --git a/ChangeLog b/ChangeLog
index 9a0f1959452e5ff2381bd576c57c4ea9ececa851..01518f870748f307b062fffca4180d1bd35de4ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -386,7 +386,12 @@
 
 2013-10-25  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
-<<<<<<< HEAD
+       [BZ #16072]
+       * sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on
+       heap for large requests.
+
+2013-10-10  Joseph Myers  <joseph@codsourcery.com>
+
        * sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Check
        for NaNs before doing comparisons on argument.
        * sysdeps/ieee754/ldbl-128ibm/e_asinl.c (__ieee754_asinl):
@@ -877,11 +882,6 @@
 
        * sysdeps/unix/sysv/linux/tst-fanotify.c: New test.
        * sysdeps/unix/sysv/linux/Makefile (tests): Add tst-fanotify.
-=======
-       [BZ #16072]
-       * sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on
-       heap for large requests.
->>>>>>> 6f95434... Fix stack overflow due to large AF_INET6 requests
 
 2013-09-02  Joseph Myers  <joseph@codesourcery.com>