From: Glenn Morris <rgm@gnu.org>
Date: Sun, 18 Nov 2012 02:19:43 +0000 (-0800)
Subject: ChangeLog Merge fix
X-Git-Tag: emacs-24.3.90~173^2~18^2~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c9c9b0b70d66281e97f5bc2c5041c5499828a63;p=emacs.git

ChangeLog Merge fix
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd1cf014ef2..0bd5fe0a149 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -18,7 +18,6 @@
 
 2012-11-18  Glenn Morris  <rgm@gnu.org>
 
-	* woman.el (woman-non-underline-faces):
 	* emacs-lisp/cl-lib.el (face-underline-p):
 	Use set-face-underline rather than the alias set-face-underline-p.