Mercurial > emacs

diff etc/NEWS @ 61732:2b20595aa66d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Nick Roberts <nickrob@snap.net.nz>
date Fri, 22 Apr 2005 04:11:30 +0000
parents 6c517123b411
children 4e6f515a7995
line wrap: on
line diff
--- a/etc/NEWS	Fri Apr 22 04:09:43 2005 +0000
+++ b/etc/NEWS	Fri Apr 22 04:11:30 2005 +0000
@@ -2850,7 +2850,6 @@
 *** New macro define-obsolete-variable-alias to combine defvaralias and
 make-obsolete-variable.
 
->>>>>>> 1.1157
 ---
 ** easy-mmode-define-global-mode has been renamed to
 define-global-minor-mode.  The old name remains as an alias.