doc: Fix doxygen comment silent merge conflict in descriptor.cpp#21736
Merged
maflcko merged 1 commit intobitcoin:masterfrom Apr 20, 2021
Merged
doc: Fix doxygen comment silent merge conflict in descriptor.cpp#21736maflcko merged 1 commit intobitcoin:masterfrom
maflcko merged 1 commit intobitcoin:masterfrom
Conversation
It looks like bitcoin#21238 introduced a silent merge conflict in the documentation, which fails with `-Wdocumentation` in the CI.
Member
|
ACK if green |
1 similar comment
Member
|
ACK if green |
Contributor
|
ACK e5faec6 -- fixed it for me |
Contributor
meshcollider
left a comment
meshcollider
left a comment
There was a problem hiding this comment.
ACK e5faec6 modulo CI
Member
|
Only looked at the nowallet task: This pull: Green 🚀 |
Member
|
FWIW, That is the reason why I'm suggesting to |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Apr 20, 2021
…n 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
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Apr 20, 2021
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It looks like #21238 introduced a silent merge conflict in the documentation, which fails with
-Wdocumentationin the CI.(please merge only if CI passes)