[Emacs-diffs] master 2354db7: Fix merge glitches in 2 ChangeLog files.

[Eli Zaretskii]

branch: master
commit 2354db7f53c25cfdac1b9436bbc56a54f16253f0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix merge glitches in 2 ChangeLog files.
---
 ChangeLog     |    1 -
 src/ChangeLog |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61cada9..026ae89 100644
--- 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  <address@hidden>
 2014-12-05  Eli Zaretskii  <address@hidden>
 
        * .gitignore: Ignore test/biditest.txt.
diff --git a/src/ChangeLog b/src/ChangeLog
index 5caa073..9cb9270 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,7 +21,6 @@
        at once, call ns_set_represented_filename instead.
 
 2014-12-05  Eli Zaretskii  <address@hidden>
-2014-12-05  Eli Zaretskii  <address@hidden>
 
        * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.
        (struct bidi_stack): Reduce size by using bit fields and by