From 1e1626adb5bd33deaa4122092ed96ae033fcd97c Mon Sep 17 00:00:00 2001
From: David Wurm <david@techniknews.net>
Date: Thu, 19 Sep 2019 20:58:18 +0200
Subject: [PATCH] changed some things

---
 {Mergesort/.idea => .idea}/.name              |   0
 .idea/misc.xml                                |   4 +-
 .idea/modules.xml                             |   2 +-
 Mergesort/Mergesort.iml => Mergesort.iml      |   0
 Mergesort/.idea/misc.xml                      |   6 --
 Mergesort/.idea/modules.xml                   |   8 ---
 Mergesort/.idea/workspace.xml                 |  66 ------------------
 hallo/lul.txt                                 |   0
 .../production/Mergesort/Mergesort.class      | Bin
 {Mergesort/src => src}/Mergesort.java         |   0
 10 files changed, 3 insertions(+), 83 deletions(-)
 rename {Mergesort/.idea => .idea}/.name (100%)
 rename Mergesort/Mergesort.iml => Mergesort.iml (100%)
 delete mode 100644 Mergesort/.idea/misc.xml
 delete mode 100644 Mergesort/.idea/modules.xml
 delete mode 100644 Mergesort/.idea/workspace.xml
 delete mode 100644 hallo/lul.txt
 rename {Mergesort/out => out}/production/Mergesort/Mergesort.class (100%)
 rename {Mergesort/src => src}/Mergesort.java (100%)

diff --git a/Mergesort/.idea/.name b/.idea/.name
similarity index 100%
rename from Mergesort/.idea/.name
rename to .idea/.name
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 28a804d..e0844bc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 315d383..f586fc5 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/_Programme.iml" filepath="$PROJECT_DIR$/.idea/_Programme.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Mergesort.iml" filepath="$PROJECT_DIR$/Mergesort.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Mergesort/Mergesort.iml b/Mergesort.iml
similarity index 100%
rename from Mergesort/Mergesort.iml
rename to Mergesort.iml
diff --git a/Mergesort/.idea/misc.xml b/Mergesort/.idea/misc.xml
deleted file mode 100644
index e0844bc..0000000
--- a/Mergesort/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Mergesort/.idea/modules.xml b/Mergesort/.idea/modules.xml
deleted file mode 100644
index f586fc5..0000000
--- a/Mergesort/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Mergesort.iml" filepath="$PROJECT_DIR$/Mergesort.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Mergesort/.idea/workspace.xml b/Mergesort/.idea/workspace.xml
deleted file mode 100644
index 8f2d79a..0000000
--- a/Mergesort/.idea/workspace.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="c8adc784-126f-470a-a7fd-698c37d72caf" name="Default Changelist" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectId" id="1QzzoweBm11mFzbea31cckI8MbE" />
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Mergesort" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Mergesort" />
-      <module name="Mergesort" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.Mergesort" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="c8adc784-126f-470a-a7fd-698c37d72caf" name="Default Changelist" comment="" />
-      <created>1568788391205</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1568788391205</updated>
-      <workItem from="1568788394064" duration="53000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/hallo/lul.txt b/hallo/lul.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Mergesort/out/production/Mergesort/Mergesort.class b/out/production/Mergesort/Mergesort.class
similarity index 100%
rename from Mergesort/out/production/Mergesort/Mergesort.class
rename to out/production/Mergesort/Mergesort.class
diff --git a/Mergesort/src/Mergesort.java b/src/Mergesort.java
similarity index 100%
rename from Mergesort/src/Mergesort.java
rename to src/Mergesort.java