|
| From: | Noam Postavsky |
| Subject: | Re: master 5fe9375 2/3: Merge from origin/emacs-26 |
| Date: | Wed, 15 May 2019 19:06:14 -0400 |
On Wed, 15 May 2019 at 16:39, Glenn Morris <address@hidden> wrote: > Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules? Should be fixed now. [1: e7e92dc5d2]: 2019-05-15 19:04:14 -0400 Fix merge of sgml-syntax-propertize-rules https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e7e92dc5d24ac3bcde69732bab6a6c3c0d9de97b
| [Prev in Thread] | Current Thread | [Next in Thread] |