Mercurial > emacs
changeset 70111:9f68cc95e2da
Remove conflict marker.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Wed, 19 Apr 2006 06:29:47 +0000 |
| parents | ce4a07c75843 |
| children | 15278e681be3 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Apr 18 23:50:28 2006 +0000 +++ b/lisp/ChangeLog Wed Apr 19 06:29:47 2006 +0000 @@ -216,7 +216,6 @@ * subr.el (read-passwd): Bind `message-log-max' to nil. ->>>>>>> 1.9411 2006-04-12 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/perl-mode.el (perl-indent-new-calculate):