From ff5497744cb43ebdc2457bb9cf43344a87e9d164 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 10 May 2000 21:37:06 +0000 Subject: [PATCH] Cleaned some left over bogus conflict markers. --- etc/NEWS | 8 -------- 1 file changed, 8 deletions(-) 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 -- 2.39.5