Mercurial > emacs
diff etc/CONTRIBUTE @ 87171:4b0ef62e1965
Remove conflict marker.
author | David Kastrup <dak@gnu.org> |
---|---|
date | Sat, 08 Dec 2007 01:06:12 +0000 |
parents | a80ba7633360 |
children | 107ccd98fa12 |
author | David Kastrup <dak@gnu.org> |
---|---|
date | Sat, 08 Dec 2007 01:06:12 +0000 |
parents | a80ba7633360 |
children | 107ccd98fa12 |