From 8a6b2667b515faa808a744891439b20cda917fa8 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri, 2 Jun 2023 17:13:12 +0200
Subject: [PATCH] fix unresolved merge conflict in config.default.yaml

---
 config/config.default.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/config.default.yaml b/config/config.default.yaml
index 93c40e45..d2d548e9 100644
--- a/config/config.default.yaml
+++ b/config/config.default.yaml
@@ -266,15 +266,12 @@ lines:
   s_nom_max: .inf
   length_factor: 1.25
   under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity
-<<<<<<< HEAD
   dynamic_line_rating:
     activate: false
     # factor compensate overestimation of the wind speed in hourly averaged wind data
     correction_factor: 0.95
     max_voltage_difference: 45 # in deg or `false` to disable
     max_line_rating: false # over capacity relative to nominal capacity e.g. 1.3 or `false`to disable
-=======
->>>>>>> master
 
 links:
   p_max_pu: 1.0