aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. J. van der Laan <laanwj@protonmail.com>2021-04-20 09:27:43 +0200
committerW. J. van der Laan <laanwj@protonmail.com>2021-04-20 09:29:43 +0200
commite5faec65bd06a3b14175aca3040290f343bd6e9c (patch)
treeac8ab10ea54f6e0f0564f31c092df063e820fd07
parent906ecb87c8c787c63a479e1dca44a15571ecc772 (diff)
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.
-rw-r--r--src/script/descriptor.cpp2
1 files changed, 1 insertions, 1 deletions
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.