Mercurial > emacs
comparison doc/lispref/locals.texi @ 107775:d0d89fd7a351
Fix merge conflicts in ldefs-boot.el.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 03 Apr 2010 16:59:53 +0300 |
parents | 1d1d5d9bd884 |
children | 452f0cc5f879 e2da1d33db95 |
comparison
equal
deleted
inserted
replaced
107774:291efac2eff3 | 107775:d0d89fd7a351 |
---|