; Fix merge snafus
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Jan 2024 11:37:09 +0000 (06:37 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Jan 2024 11:37:09 +0000 (06:37 -0500)
commit8bb5525b62163d7c3617a8b61da94f1a12a8d8e8
tree7537132ef5fb348617798b47198fae272f7b8b0f
parent1b31a784bfb56c3c5d138d906601428ebd3e737b
; Fix merge snafus

* lisp/jsonrpc.el:
* lisp/progmodes/eglot.el: Fix merge snafus.
lisp/jsonrpc.el
lisp/progmodes/eglot.el