Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
YinHoon committed Oct 24, 2019
2 parents d9c14d4 + 0ded57f commit a146be2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions datanator_query_python/query/query_sabiork_old.py
Expand Up @@ -83,10 +83,8 @@ def get_kinlawid_by_rxn(self, substrates, products, dof=0):
Args:
substrates (:obj:`list`): list of substrates' inchikey
products (:obj:`list`): list of products' inchikey
dof (:obj:`int`, optional): if 0, the full inchikey wil be used for matching;
else if 1, only the first and second part of the inchikey will be used;
else, only the firts part of the inchikey will be used;
the default is 0
dof (:obj:`int`, optional): degree of freedom allowed (number of parts of
inchikey to truncate); the default is 0
Return:
rxns: list of kinlaw_ids that satisfy the condition
Expand Down

0 comments on commit a146be2

Please sign in to comment.