From e5faec65bd06a3b14175aca3040290f343bd6e9c Mon Sep 17 00:00:00 2001 From: "W. J. van der Laan" Date: Tue, 20 Apr 2021 09:27:43 +0200 Subject: doc: Fix doxygen comment silent merge conflict in descriptor.cpp It looks like #21238 introduced a silent merge conflict in the documentation, which fails with `-Wdocumentation` in the CI. --- src/script/descriptor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script') diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 5f085d233a..f1433553bc 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -495,7 +495,7 @@ protected: * This function is invoked once by ExpandHelper. * * @param pubkeys The evaluations of the m_pubkey_args field. - * @param script The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element). + * @param scripts The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element). * @param out A FlatSigningProvider to put scripts or public keys in that are necessary to the solver. * The origin info of the provided pubkeys is automatically added. * @return A vector with scriptPubKeys for this descriptor. -- cgit v1.2.3