Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned some left over bogus conflict markers.

Browse source
This commit is contained in:
Stefan Monnier 2000-05-10 21:37:06 +00:00
parent dc1178bfdc
commit ff5497744c
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/NEWS
View file

@ -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