Skip to content

Commit 572b36d

Browse files
author
MarcoFalke
committed
Merge bitcoin#21736: doc: Fix doxygen comment silent merge conflict in descriptor.cpp
e5faec6 doc: Fix doxygen comment silent merge conflict in descriptor.cpp (W. J. van der Laan) Pull request description: It looks like bitcoin#21238 introduced a silent merge conflict in the documentation, which fails with `-Wdocumentation` in the CI. (please merge only if CI passes) ACKs for top commit: ajtowns: ACK e5faec6 -- fixed it for me meshcollider: ACK e5faec6 modulo CI Tree-SHA512: b07d50fd12aa7c239a92aad8ef29f4e88583c3ce701ebedba7c426aac4981c79113adc4670b7d055ab9535a28bdc3f9a30e6ca1b1ed0d7b9a333a3d9c4b40d8a
2 parents 906ecb8 + e5faec6 commit 572b36d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/script/descriptor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ class DescriptorImpl : public Descriptor
495495
* This function is invoked once by ExpandHelper.
496496
*
497497
* @param pubkeys The evaluations of the m_pubkey_args field.
498-
* @param script The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element).
498+
* @param scripts The evaluations of m_subdescriptor_args (one for each m_subdescriptor_args element).
499499
* @param out A FlatSigningProvider to put scripts or public keys in that are necessary to the solver.
500500
* The origin info of the provided pubkeys is automatically added.
501501
* @return A vector with scriptPubKeys for this descriptor.

0 commit comments

Comments
 (0)