Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-10-14 00:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts from main branch

Browse Source 
Signed-off-by: Sangat Das <sangatdas5@gmail.com>
This commit is contained in:
Sangat Das 2022-03-22 07:57:10 +00:00
commit a80a95897e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/common/test_transaction.py
View File

@ -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),