Skip to content
GitLab
Commit aecd8b00 authored by Carles Tena's avatar Carles Tena
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/70-fugitive_fossil_fuels-implementation-of-a-new-emission-sector-in-hermesv3_bu'

# Conflicts:
#	hermesv3_bu/sectors/sector.py
parents aa709593 6f4c1049
Pipeline #11286 canceled with stages
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment