From dcff3aeabd852e27bf0446d59fac96a2bde379b5 Mon Sep 17 00:00:00 2001
From: dxnso <david@emailarchiv.de>
Date: Tue, 23 Jul 2019 10:03:57 +0200
Subject: [PATCH] Merge branch 'master' of
 C:\Users\wurstda\PycharmProjects\Projekttage with conflicts.

---
 .idea/Projekttage.iml        | 11 +++++++++++
 .idea/modules.xml            |  2 +-
 Uebungen/Hallolo/__init__.py |  0
 Uebungen/test.txt            |  4 +++-
 Uebungen/test2.py            |  0
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .idea/Projekttage.iml
 create mode 100644 Uebungen/Hallolo/__init__.py
 create mode 100644 Uebungen/test2.py

diff --git a/.idea/Projekttage.iml b/.idea/Projekttage.iml
new file mode 100644
index 0000000..6711606
--- /dev/null
+++ b/.idea/Projekttage.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3d624ce..9fb6e7a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage1.iml" filepath="$PROJECT_DIR$/.idea/Projekttage1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Uebungen/Hallolo/__init__.py b/Uebungen/Hallolo/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Uebungen/test.txt b/Uebungen/test.txt
index 18c28f0..a131000 100644
--- a/Uebungen/test.txt
+++ b/Uebungen/test.txt
@@ -1 +1,3 @@
-Mir fällt nix ein
\ No newline at end of file
+name = "Huan"
+text = "Hier bitte Text einfügen"
+SDAfsv
\ No newline at end of file
diff --git a/Uebungen/test2.py b/Uebungen/test2.py
new file mode 100644
index 0000000..e69de29