procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete leftover conflict markers.

Browse source
This commit is contained in:
Romain Francoise 2008-10-12 09:17:13 +00:00
parent 864c974046
commit 69d31e5183
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/ChangeLog
View file

@ -45,13 +45,11 @@
* PROBLEMS:
* MACHINES: Remove VMS info.
>>>>>>> 1.736
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
>>>>>>> 1.727
2008-07-24 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.