From 9c8c33640dbcfc4c006af74e282ad6a697018700 Mon Sep 17 00:00:00 2001
From: michelar <micharthur2003@gmail.com>
Date: Mon, 22 Jul 2019 10:32:20 +0200
Subject: [PATCH] Merge branch 'master' of
 C:\Users\michelar\PycharmProjects\Projekttage with conflicts.

---
 .idea/Projekttage.iml    | 11 +++++++++++
 Uebungen/test.txt        |  1 -
 Uebungen/uff/__init__.py |  8 ++++++++
 Uebungen/uff/asdfgh.py   |  8 ++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 .idea/Projekttage.iml
 create mode 100644 Uebungen/uff/__init__.py
 create mode 100644 Uebungen/uff/asdfgh.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/Uebungen/test.txt b/Uebungen/test.txt
index 18c28f0..e69de29 100644
--- a/Uebungen/test.txt
+++ b/Uebungen/test.txt
@@ -1 +0,0 @@
-Mir fällt nix ein
\ No newline at end of file
diff --git a/Uebungen/uff/__init__.py b/Uebungen/uff/__init__.py
new file mode 100644
index 0000000..0a89ef5
--- /dev/null
+++ b/Uebungen/uff/__init__.py
@@ -0,0 +1,8 @@
+alter = int(input ("Wie alt bist du?"))
+
+print (alter)
+
+if alter <=18:
+    print ("Du junges Schwein")
+else:
+    print ("ehre")
diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py
new file mode 100644
index 0000000..0a89ef5
--- /dev/null
+++ b/Uebungen/uff/asdfgh.py
@@ -0,0 +1,8 @@
+alter = int(input ("Wie alt bist du?"))
+
+print (alter)
+
+if alter <=18:
+    print ("Du junges Schwein")
+else:
+    print ("ehre")