Commit 6c9c9b0b authored by Glenn Morris's avatar Glenn Morris
Browse files

ChangeLog Merge fix

parent 2ac9538d
......@@ -18,7 +18,6 @@
2012-11-18 Glenn Morris <>
* 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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment