From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 17:18:55 +0000 (-0800)
Subject: ChangeLog merge fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~128
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6df29f90e195fcdb9350985db69f6aed8952fa7;p=emacs.git

ChangeLog merge fix.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d300ed84062..062f6f4ad87 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -26,7 +26,6 @@
 	(Windows Startup): New node.  Move the stuff about the current
 	directory from "Windows HOME".
 
-2010-12-13  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 2010-11-27  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 
 	* maintaining.texi (VC With A Locking VCS, VC Directory Commands):