From 175b14e24815e2b6b348d402ebc9c27c4f695633 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 27 Apr 2021 14:49:27 +0200
Subject: [PATCH] merge master follow-up

---
 doc/costs.rst | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/doc/costs.rst b/doc/costs.rst
index 68ebc12e..f56e40d3 100644
--- a/doc/costs.rst
+++ b/doc/costs.rst
@@ -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