Mercurial > emacs
diff README @ 84775:8589ca45e3b9
Delete conflict markers.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 22 Sep 2007 01:57:23 +0000 |
parents | acde5b207e40 |
children | 107ccd98fa12 |
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 22 Sep 2007 01:57:23 +0000 |
parents | acde5b207e40 |
children | 107ccd98fa12 |