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

Remove conflict marker.

Browse source
This commit is contained in:
Romain Francoise 2007-03-01 13:58:24 +00:00
parent cde6fe5cd0
commit 404a2a4b52
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -45,7 +45,6 @@
* desktop.el: Delete header line listing me as maintainer.
>>>>>>> 1.10749
2007-02-28 Glenn Morris <rgm@gnu.org>
* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in