Mercurial > emacs
diff src/textprop.c @ 32354:eaa80d9a03d4
Remove CVS merge cookie left in.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 10 Oct 2000 02:32:57 +0000 |
parents | f886557e4b2a |
children | e1dec7e5a57c |
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 10 Oct 2000 02:32:57 +0000 |
parents | f886557e4b2a |
children | e1dec7e5a57c |