mirror of
https://github.com/bigchaindb/bigchaindb.git
synced 2024-10-13 13:34:05 +00:00
Resolve conflicts with master
Signed-off-by: Amartya Gaur amarkaushik1999@gmail.com
This commit is contained in:
parent
d3bf7b92e4
commit
557eed4257
@ -546,7 +546,7 @@ class Transaction(object):
|
||||
elif (operation == self.TRANSFER and
|
||||
not (isinstance(asset, dict) and 'id' in asset)):
|
||||
raise TypeError(('`asset` must be a dict holding an `id` property '
|
||||
"for \'TRANSFER\' Transactions"))
|
||||
'for \'TRANSFER\' Transactions'))
|
||||
|
||||
if outputs and not isinstance(outputs, list):
|
||||
raise TypeError('`outputs` must be a list instance or None')
|
||||
|
Loading…
x
Reference in New Issue
Block a user