Fix merge glitches in 2 ChangeLog files.

diff --git a/ChangeLog b/ChangeLog
index 61cada99c007b8abf1ca574fa7de0d62daf2c7e7..026ae8952799d97a571c1bcc27469d1bc1be7b60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,6 @@
        * .gitignore: Remove redundant pattern (subsumed by _*).
        Avoid "**", as it requires Git 1.8.2 or later.
 
-2014-12-05  Paul Eggert  <eggert@cs.ucla.edu>
 2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 
        * .gitignore: Ignore test/biditest.txt.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5caa073c2c972f168fcd7543a35dbe91606a56ef..9cb9270e55dfd91baafb7619898e736f929f829b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -20,7 +20,6 @@
        * nsfns.m (ns_set_name_as_filename): Don't set represented filename
        at once, call ns_set_represented_filename instead.
 
-2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 
        * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.