; Manually fix merge errors in etc/NEWS
This commit is contained in:
parent
2bbc554db6
commit
e871f21348
2 changed files with 3 additions and 3 deletions
3
etc/NEWS
3
etc/NEWS
|
@ -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
|
||||
|
||||
+++
|
||||
|
|
|
@ -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
|
||||
|
||||
+++
|
||||
|
|
Loading…
Add table
Reference in a new issue