Commit Graph

53 Commits

Author SHA1 Message Date
Fabian Hofmann
65700000f7 Merge branch 'add_own_carriers' of https://github.com/eb5194/pypsa-eur into eb5194-add_own_carriers 2019-10-31 14:23:43 +01:00
Fabian Neumann
0fef13ee86 resolve merge conflicts 2019-10-24 16:22:57 +02:00
Fabian Neumann
6f27e753e5 default and tutorial config.x.yaml - cf. #49 2019-10-03 12:37:23 +02:00