Mercurial > emacs
comparison oldXMenu/Error.c @ 87171:4b0ef62e1965
Remove conflict marker.
| author | David Kastrup <dak@gnu.org> |
|---|---|
| date | Sat, 08 Dec 2007 01:06:12 +0000 |
| parents | fec5e03aaf59 |
| children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |
comparison
equal
deleted
inserted
replaced
| 87170:e50a2e215441 | 87171:4b0ef62e1965 |
|---|