Add regression test for zallet BlockConflict recovery (zcash/zallet#556/#560)#151

Cosmos-Harry wants to merge 1 commit into

mainzcash/integration-tests:mainfrom

harry/zallet-block-conflict-testzcash/integration-tests:harry/zallet-block-conflict-testCopy head branch name to clipboard