From 51437d37f3d2bf295d8f480aa5acbac67a57057b Mon Sep 17 00:00:00 2001
From: ulfmueller <ulf.p.mueller@hs-flensburg.de>
Date: Tue, 17 Oct 2023 14:32:13 +0200
Subject: [PATCH] fixed some merging issues

---
 etrago/tools/network.py | 2 +-
 etrago/tools/plot.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etrago/tools/network.py b/etrago/tools/network.py
index 46ed559c..e047cfd7 100644
--- a/etrago/tools/network.py
+++ b/etrago/tools/network.py
@@ -55,7 +55,7 @@
     german_network,
     system_costs_germany,
 )
-from etrago.tools.execute import (
+from etrago.execute import (
     dispatch_disaggregation,
     optimize,
     lopf,
diff --git a/etrago/tools/plot.py b/etrago/tools/plot.py
index 0bacc770..a490feec 100644
--- a/etrago/tools/plot.py
+++ b/etrago/tools/plot.py
@@ -25,7 +25,7 @@
 import logging
 import os
 
-from etrago.tools.execute import import_gen_from_links
+from etrago.execute import import_gen_from_links
 from matplotlib import pyplot as plt
 from matplotlib.legend_handler import HandlerPatch
 from matplotlib.patches import Circle, Ellipse