Mercurial > emacs
changeset 62973:b89ed3c14158
Remove conflict marker.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Fri, 03 Jun 2005 14:18:31 +0000 |
| parents | 6331f03975bb |
| children | ecfed70e0c5c |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jun 03 11:24:06 2005 +0000 +++ b/lisp/ChangeLog Fri Jun 03 14:18:31 2005 +0000 @@ -34,7 +34,6 @@ * viper.el (viper-non-hook-settings): Fixed the names of defadvices. ->>>>>>> 1.7661 2005-06-01 Luc Teirlinck <teirllm@auburn.edu> * autorevert.el (auto-revert-buffers): Use save-match-data.