Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pathways/lca.py
#	pathways/pathways.py
#	setup.py
  • Loading branch information
romainsacchi authored and romainsacchi committed Mar 19, 2024
2 parents 77a2c3b + 442597f commit a64d575
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions pathways/lcia.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,3 @@ def get_lcia_methods(methods: list = None):
data = [x for x in data if " - ".join(x["name"]) in methods]

return {" - ".join(x["name"]): format_lcia_method_exchanges(x) for x in data}



0 comments on commit a64d575

Please sign in to comment.