|
| From: | Glenn Morris |
| Subject: | Re: master 5fe9375 2/3: Merge from origin/emacs-26 |
| Date: | Tue, 14 May 2019 20:38:00 -0400 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
> branch: master > commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 > Merge: 0f63e17 02bee78 > # Conflicts: > # lisp/textmodes/sgml-mode.el Please could you check the resolution of this conflict?
| [Prev in Thread] | Current Thread | [Next in Thread] |