DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix readme merge error

Browse Source
This commit is contained in:
miketout
2018-10-11 14:31:15 -07:00
parent 8b57c15f6a
commit 3ce8aba005
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qa/rpc-tests/README.md
View File

@@ -18,15 +18,9 @@ Possible options:
``` ```
-h, --help show this help message and exit -h, --help show this help message and exit
<<<<<<< HEAD
--nocleanup Leave komodods and test.* datadir on exit or error --nocleanup Leave komodods and test.* datadir on exit or error
--noshutdown Don't stop komodods after the test execution --noshutdown Don't stop komodods after the test execution
--srcdir=SRCDIR Source directory containing komodod/komodo-cli (default: --srcdir=SRCDIR Source directory containing komodod/komodo-cli (default:
=======
--nocleanup Leave zcashds and test.* datadir on exit or error
--noshutdown Don't stop bitcoinds after the test execution
--srcdir=SRCDIR Source directory containing zcashd/zcash-cli (default:
>>>>>>> 807fb7497ffc6898790a86f807d3a2a0669d5ff7
../../src) ../../src)
--tmpdir=TMPDIR Root directory for datadirs --tmpdir=TMPDIR Root directory for datadirs
--tracerpc Print out all RPC calls as they are made --tracerpc Print out all RPC calls as they are made