Skip to content

Commit

Permalink
doc: Fix doxygen comment silent merge conflict in descriptor.cpp
Browse files Browse the repository at this point in the history
It looks like bitcoin#21238 introduced a silent merge conflict in the
documentation, which fails with `-Wdocumentation` in the CI.
  • Loading branch information
laanwj committed Apr 20, 2021
1 parent 906ecb8 commit e5faec6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/script/descriptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ class DescriptorImpl : public Descriptor
* 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.
Expand Down

0 comments on commit e5faec6

Please sign in to comment.