[Emacs-diffs] Changes to emacs/etc/NEWS

[Nick Roberts]

Index: emacs/etc/NEWS
diff -c emacs/etc/NEWS:1.1158 emacs/etc/NEWS:1.1159
*** emacs/etc/NEWS:1.1158       Fri Apr 22 04:09:43 2005
--- emacs/etc/NEWS      Fri Apr 22 04:11:30 2005
***************
*** 2850,2856 ****
  *** 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.
--- 2850,2855 ----