Mercurial > emacs
comparison lisp/calendar/cal-dst.el @ 76254:5ae1368180c3
Remove conflict marker.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Thu, 01 Mar 2007 13:58:24 +0000 |
| parents | 7a3f13e2dd57 |
| children | 3878691bdbb7 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 76253:cd3e9a5647d3 | 76254:5ae1368180c3 |
|---|