From 3305222e93a80b281a95f4d94d63db0f2c402a47 Mon Sep 17 00:00:00 2001
From: Spongebob-Schwammkopf <materntim1@gmail.com>
Date: Wed, 24 Jul 2019 08:14:36 +0200
Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/misc.xml
---
 .idea/Projekttage.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/Projekttage.iml b/.idea/Projekttage.iml
index 6711606..f3d7bc9 100644
--- a/.idea/Projekttage.iml
+++ b/.idea/Projekttage.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

From 574b8037a6dcef408b85622dc6540c2425845b89 Mon Sep 17 00:00:00 2001
From: Spongebob-Schwammkopf <materntim1@gmail.com>
Date: Wed, 24 Jul 2019 08:26:18 +0200
Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/misc.xml
---
 Klassen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Klassen.py b/Klassen.py
index dd227b0..7d93f81 100644
--- a/Klassen.py
+++ b/Klassen.py
@@ -33,7 +33,7 @@ class Formel:
             pass
 
         def _solve_to_d(self):
-            pass
+            return i - g - (a**z) * (b**y)* (c**x) / e * f
 
         def _solve_to_e(self):
             pass