Mercurial > emacs
diff lisp/descr-text.el @ 54193:318542a275c4
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 28 Feb 2004 22:45:01 +0000 |
parents | 82e324c1ebf4 |
children | ee587e56fbc4 |
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 28 Feb 2004 22:45:01 +0000 |
parents | 82e324c1ebf4 |
children | ee587e56fbc4 |