Mercurial > emacs
diff lisp/delim-col.el @ 91450:afc545f3960e
Remove conflict marker and merged entries about re-generating config.in.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 02 Feb 2008 04:47:40 +0000 |
parents | 73661ddc7ac7 |
children | 606f2d163a64 1e3a407766b9 |