From 6c9c9b0b70d66281e97f5bc2c5041c5499828a63 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 17 Nov 2012 18:19:43 -0800
Subject: [PATCH] ChangeLog Merge fix

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.
 
-- 
2.39.5