From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 8 Dec 2014 17:10:38 +0000 (+0200)
Subject: Fix merge glitches in 2 ChangeLog files.
X-Git-Tag: emacs-25.0.90~2635^2~165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2354db7f53c25cfdac1b9436bbc56a54f16253f0;p=emacs.git

Fix merge glitches in 2 ChangeLog files.
---

diff --git a/ChangeLog b/ChangeLog
index 61cada99c00..026ae895279 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  <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 5caa073c2c9..9cb9270e55d 100644
--- 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.