From e871f21348a737541b181445c911dd58c34e9a47 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 21 Dec 2022 02:38:13 +0100 Subject: [PATCH] ; Manually fix merge errors in etc/NEWS --- etc/NEWS | 3 --- etc/NEWS.29 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index dd1f1bbf24f..af7f1050b76 100644 --- a/etc/NEWS +++ b/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 +++ diff --git a/etc/NEWS.29 b/etc/NEWS.29 index 017fd850b4e..0e844596347 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -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 +++ -- 2.39.2