From 0f549d253fffe5a5f925e5aaed9f37e4b63461d8 Mon Sep 17 00:00:00 2001
From: Lucas Regh <luregh@gmail.com>
Date: Wed, 15 Jan 2020 08:45:06 +0100
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 .idea/misc.xml                                        |  5 ++++-
 .../compile/default-compile/createdFiles.lst          | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1192781..510c331 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -8,7 +11,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" 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/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 36e6742..eacf951 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,7 +1,18 @@
+de\flexusma\jdacmdh\CommandPreferences.class
 de\flexusma\jdacmdh\exception\DatabaseInitializationFailedException.class
+de\flexusma\jdacmdh\IntiCommands.class
+de\flexusma\jdacmdh\Emoticons.class
 de\flexusma\jdacmdh\command\Command.class
+de\flexusma\jdacmdh\CommandListener.class
 de\flexusma\jdacmdh\CommandInitBuilder.class
+<<<<<<< Updated upstream
 de\flexusma\jdacmdh\CommandPreferences.class
 de\flexusma\jdacmdh\command\ReactionCommand.class
 de\flexusma\jdacmdh\database\Database.class
+=======
+de\flexusma\jdacmdh\EmbededBuilder.class
+>>>>>>> Stashed changes
 de\flexusma\jdacmdh\command\CommandEvent.class
+de\flexusma\jdacmdh\debug\Logger.class
+de\flexusma\jdacmdh\Database.class
+de\flexusma\jdacmdh\debug\LogType.class