From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 10 May 2000 21:37:06 +0000 (+0000)
Subject: Cleaned some left over bogus conflict markers.
X-Git-Tag: emacs-pretest-21.0.90~4011
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff5497744cb43ebdc2457bb9cf43344a87e9d164;p=emacs.git

Cleaned some left over bogus conflict markers.
---

diff --git a/etc/NEWS b/etc/NEWS
index e8d77daf465..b8b8a9b9702 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1155,20 +1155,12 @@ protocols.  It has a separate manual.
 
 *** 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