master updated (c8b9922e26 -> b6a7b42b19)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  c8b9922e26 ediff: Merges with ancestor: Fix computation of hunks 
and proposed merge
       new  954a5e79dc Add Eglot alternatives for PHP language servers
       new  b6a7b42b19 * lisp/progmodes/eglot.el (eglot-server-programs): 
Remove Intelephense.


Summary of changes:
 lisp/progmodes/eglot.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)