1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00

; Manually fix merge errors in etc/NEWS

This commit is contained in:
Stefan Kangas 2022-12-21 02:38:13 +01:00
parent 2bbc554db6
commit e871f21348
2 changed files with 3 additions and 3 deletions

View File

@ -71,9 +71,6 @@ switches for shortlogs, such as the one produced by 'C-x v L'.
You can now configure how to display the "*buffer-selection*" buffer
using this new option. (Or set 'display-buffer-alist' directly.)
---
*** New user option 'ruby-method-params-indent'.
** Eshell
+++

View File

@ -2761,6 +2761,9 @@ project-dedicated or global) is specified by the new
---
*** Support for endless methods.
---
*** New user option 'ruby-method-params-indent'.
** Eshell
+++