Skip to content

Commit e5faec6

Browse files
committed
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.
1 parent 906ecb8 commit e5faec6

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)