diff options
| author | fanquake <fanquake@gmail.com> | 2023-08-18 09:46:19 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-08-18 10:01:22 +0100 |
| commit | e4a855c4e0f866b4358448730a88c5e050b737a9 (patch) | |
| tree | b8bd6ff796ca6bab5fb50c460b3ae7cd74d03ad5 | |
| parent | 6ce5e8f4758e6fccf59b3980af417ec6c75e383e (diff) | |
| parent | 239431444216850b63ecf01c3b5c5d6d24230d08 (diff) | |
Merge bitcoin/bitcoin#28289: rpc: remove one more quote from non-string oneline description
239431444216850b63ecf01c3b5c5d6d24230d08 rpc: remove one more quote from non-string oneline description (Martin Zumsande)
Pull request description:
This fixes a silent conflict between https://github.com/bitcoin/bitcoin/pull/28123 (which removed all `\"options\"`) and https://github.com/bitcoin/bitcoin/pull/27460 (which added a new one).
It should fix the current CI failures.
ACKs for top commit:
ajtowns:
utACK 239431444216850b63ecf01c3b5c5d6d24230d08
MarcoFalke:
lgtm ACK 239431444216850b63ecf01c3b5c5d6d24230d08
jonatack:
ACK 239431444216850b63ecf01c3b5c5d6d24230d08
hebasto:
ACK 239431444216850b63ecf01c3b5c5d6d24230d08
Tree-SHA512: feb0c2b936a77be45d9c65aa7d738277b2266b5153665fee3b1413045de521195dc7d5efa2fc8b37b22f16e9b8d0ee8de25bfd151a428666122b31f64056557a
| -rw-r--r-- | src/rpc/mempool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp index b1d2414416..bda0e7c348 100644 --- a/src/rpc/mempool.cpp +++ b/src/rpc/mempool.cpp @@ -744,7 +744,7 @@ static RPCHelpMan importmempool() "Whether to apply the unbroadcast set metadata from the mempool file.\n" "Warning: Importing untrusted metadata may lead to unexpected issues and undesirable behavior."}, }, - RPCArgOptions{.oneline_description = "\"options\""}}, + RPCArgOptions{.oneline_description = "options"}}, }, RPCResult{RPCResult::Type::OBJ, "", "", std::vector<RPCResult>{}}, RPCExamples{HelpExampleCli("importmempool", "/path/to/mempool.dat") + HelpExampleRpc("importmempool", "/path/to/mempool.dat")}, |