mirror of
https://github.com/planetmint/planetmint.git
synced 2025-10-14 00:59:17 +00:00
Resolve merge conflicts from main branch
Signed-off-by: Sangat Das <sangatdas5@gmail.com>
This commit is contained in:
commit
a80a95897e
@ -1021,7 +1021,6 @@ def test_output_from_dict_invalid_amount(user_output):
|
|||||||
|
|
||||||
|
|
||||||
def test_unspent_outputs_property(merlin, alice, bob, carol):
|
def test_unspent_outputs_property(merlin, alice, bob, carol):
|
||||||
from planetmint.transactions.common.transaction import Transaction
|
|
||||||
tx = Create.generate(
|
tx = Create.generate(
|
||||||
[merlin.public_key],
|
[merlin.public_key],
|
||||||
[([alice.public_key], 1),
|
[([alice.public_key], 1),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user