diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-20 10:40:28 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-20 10:40:33 +0200 |
| commit | 572b36d4ff9945baa526abe258f2645c17c88ac5 (patch) | |
| tree | ac8ab10ea54f6e0f0564f31c092df063e820fd07 | |
| parent | 906ecb87c8c787c63a479e1dca44a15571ecc772 (diff) | |
| parent | e5faec65bd06a3b14175aca3040290f343bd6e9c (diff) | |
| download | bitcoin-572b36d4ff9945baa526abe258f2645c17c88ac5.tar.xz | |
Merge bitcoin/bitcoin#21736: doc: Fix doxygen comment silent merge conflict in descriptor.cpp
e5faec65bd06a3b14175aca3040290f343bd6e9c doc: Fix doxygen comment silent merge conflict in descriptor.cpp (W. J. van der Laan)
Pull request description:
It looks like #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 e5faec65bd06a3b14175aca3040290f343bd6e9c -- fixed it for me
meshcollider:
ACK e5faec65bd06a3b14175aca3040290f343bd6e9c modulo CI
Tree-SHA512: b07d50fd12aa7c239a92aad8ef29f4e88583c3ce701ebedba7c426aac4981c79113adc4670b7d055ab9535a28bdc3f9a30e6ca1b1ed0d7b9a333a3d9c4b40d8a
| -rw-r--r-- | src/script/descriptor.cpp | 2 |
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. |