Mercurial > emacs
diff lisp/font-lock.el @ 64524:4b1847f05684
Remove conflict markers.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Wed, 20 Jul 2005 10:01:38 +0000 |
parents | 44d210b5de14 |
children | 41bb365f41c4 187d6a1f84f7 |
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Wed, 20 Jul 2005 10:01:38 +0000 |
parents | 44d210b5de14 |
children | 41bb365f41c4 187d6a1f84f7 |