aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-01-25 11:56:51 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-01-25 11:56:54 -0500
commit1220b91fa7e8c4d2564f2ab11d7ee880a9815a72 (patch)
tree43a49e4d7e4451d76e9f66418ee37241724cb539
parent0a0b2ea11fde7becbdd1c04205336c3a39bffbc0 (diff)
parentc42f4177ce1385fa699f689d3175bf5cec0e98af (diff)
Merge #15251: [0.17] doc: Remove errant paste from walletcreatefundedpsbt for nLocktime replaceable
c42f4177ce Remove errant past from walletcreatefundedpsbt for nLocktime replaceability (Gregory Sanders) Pull request description: Backports #15213 to the 0.17 branch. Tree-SHA512: f676e0b510b3ae76bf2ae46c7be289837a6d0152972c551ad6a837aab57ec74ee529c309163c8b7e3df446c2f30f148e920702dc31504cc239f99ad4a4607114
-rw-r--r--src/wallet/rpcwallet.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e02171ec40..64cc8278ff 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4693,7 +4693,6 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
" accepted as second parameter.\n"
" ]\n"
"3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
- " Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.\n"
"4. options (object, optional)\n"
" {\n"
" \"changeAddress\" (string, optional, default pool address) The bitcoin address to receive the change\n"