aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/java
diff options
context:
space:
mode:
authorEli Zaretskii2024-01-20 06:37:09 -0500
committerEli Zaretskii2024-01-20 06:37:09 -0500
commit8bb5525b62163d7c3617a8b61da94f1a12a8d8e8 (patch)
tree7537132ef5fb348617798b47198fae272f7b8b0f /admin/notes/java
parent1b31a784bfb56c3c5d138d906601428ebd3e737b (diff)
downloademacs-8bb5525b62163d7c3617a8b61da94f1a12a8d8e8.tar.gz
emacs-8bb5525b62163d7c3617a8b61da94f1a12a8d8e8.zip
; Fix merge snafus
* lisp/jsonrpc.el: * lisp/progmodes/eglot.el: Fix merge snafus.
Diffstat (limited to 'admin/notes/java')
0 files changed, 0 insertions, 0 deletions