Mercurial > emacs

changeset 28855:1be9a502caca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleaned some left over bogus conflict markers.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 10 May 2000 21:37:06 +0000
parents a5c81109bc31
children 20f840aa2301
files etc/NEWS
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Wed May 10 21:34:11 2000 +0000
+++ b/etc/NEWS	Wed May 10 21:37:06 2000 +0000
@@ -1155,20 +1155,12 @@
 
 *** autoconf.el provides a major mode for editing configure.in files
 for Autoconf, selected automatically.
-<<<<<<< NEWS
-
-*** windmove.el
-=======
 
 *** windmove.el provides moving between windows.
->>>>>>> 1.127
-
-<<<<<<< NEWS
-=======
+
 *** crm.el provides a facility to read multiple strings from the 
 minibuffer with completion.
 
->>>>>>> 1.127
 ** Withdrawn packages
 
 *** mldrag.el has been removed.  mouse.el provides the same