Resolve conflicts with master

Signed-off-by: Amartya Gaur amarkaushik1999@gmail.com
This commit is contained in:
amartya-dev 2020-07-22 18:06:39 +05:30
parent d3bf7b92e4
commit 557eed4257
No known key found for this signature in database
GPG Key ID: 8AA4B93AE39AA14D

View File

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