# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 957994626 0
# Node ID 1be9a502caca39e06473053a98226c648502e104
# Parent  a5c81109bc317813106118cd4cb7f873acbc7a7e
Cleaned some left over bogus conflict markers.

diff -r a5c81109bc31 -r 1be9a502caca etc/NEWS
--- 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