merge master follow-up
This commit is contained in:
parent
4ec06f54bc
commit
175b14e248
@ -43,11 +43,4 @@ Some cost assumptions (e.g. marginal cost and capital cost) can be directly over
|
||||
|
||||
To change cost assumptions in more detail, modify cost assumptions directly in ``resources/costs.csv`` as this is not yet supported through the config file.
|
||||
|
||||
<<<<<<< HEAD
|
||||
You can also build multiple different cost databases. Make a renamed copy of ``resources/costs.csv`` (e.g. ``data/costs-optimistic.csv``) and set the variable ``COSTS=data/costs-optimistic.csv`` in the ``Snakefile``.
|
||||
=======
|
||||
.. csv-table::
|
||||
:header-rows: 1
|
||||
:widths: 10,3,5,4,6,8
|
||||
:file: ../data/costs.csv
|
||||
>>>>>>> master
|
||||
|
Loading…
Reference in New Issue
Block a user