fix: rename "Mask values" to "Discreet mode" #5887
Merged
Annotations
4 warnings
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 5887,
conflictPrs: [
{
number: 5579,
files: [
'doc/build-unix.md',
'doc/release-notes-16528.md',
'src/interfaces/wallet.h',
'src/pubkey.h',
'src/qt/createwalletdialog.cpp',
'src/qt/createwalletdialog.h',
'src/qt/forms/createwalletdialog.ui',
'src/qt/overviewpage.cpp',
'src/qt/receivecoinsdialog.cpp',
'src/qt/walletcontroller.cpp',
'src/rpc/client.cpp',
'src/script/descriptor.cpp',
'src/script/descriptor.h',
'src/wallet/bdb.h',
'src/wallet/db.cpp',
'src/wallet/db.h',
'src/wallet/interfaces.cpp',
'src/wallet/rpcdump.cpp',
'src/wallet/rpcwallet.cpp',
'src/wallet/scriptpubkeyman.cpp',
'src/wallet/scriptpubkeyman.h',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'src/wallet/walletutil.h',
'test/functional/feature_backwards_compatibility.py',
'test/functional/feature_filelock.py',
'test/functional/interface_bitcoin_cli.py',
'test/functional/interface_zmq.py',
'test/functional/rpc_createmultisig.py',
'test/functional/rpc_psbt.py',
'test/functional/test_framework/key.py',
'test/functional/test_framework/test_framework.py',
'test/functional/test_framework/test_node.py',
'test/functional/test_framework/wallet_util.py',
'test/functional/test_runner.py',
'test/functional/tool_wallet.py',
'test/functional/wallet_avoidreuse.py',
'test/functional/wallet_backup.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_descriptor.py',
'test/functional/wallet_encryption.py',
'test/functional/wallet_hd.py',
'test/functional/wallet_importdescriptors.py',
'test/functional/wallet_keypool_hd.py',
'test/functional/wallet_labels.py',
'test/functional/wallet_multiwallet.py'
],
conflicts: [ 'src/qt/overviewpage.cpp' ]
}
]
}
|
check for potential conflicts
Potential conflicts detected!
|
Loading