]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 287e9ff) | patch
; Fix merge snafus
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Jan 2024 11:37:09 +0000 (06:37 -0500)
committerEshel Yaron <me@eshelyaron.com>
Sat, 20 Jan 2024 16:29:59 +0000 (17:29 +0100)
commitf71712f59b0d9318d88830d1325e3fe9c937ce51
tree099c41b64a50ed64d91e44c2a85bdd2afe548e78tree | snapshot
parent287e9ffe790eb2b9a1065be36c770f1726ce115fcommit | diff
; Fix merge snafus

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

(cherry picked from commit 8bb5525b62163d7c3617a8b61da94f1a12a8d8e8)
lisp/jsonrpc.el diff | blob | history
lisp/progmodes/eglot.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.