Mercurial > emacs
comparison lisp/calendar/appt.el @ 70111:9f68cc95e2da
Remove conflict marker.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Wed, 19 Apr 2006 06:29:47 +0000 |
| parents | 14a3b2b9c00b |
| children | 95f7f08b0a17 c156f6a9e7b5 |
comparison
equal
deleted
inserted
replaced
| 70110:ce4a07c75843 | 70111:9f68cc95e2da |
|---|