Commit ff549774 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

Cleaned some left over bogus conflict markers.

parent dc1178bf
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment