Merge remote-tracking branch 'origin/master'

Flexusma · Jan 15, 2020 · 9776e92 · 9776e92
2 parents 25b69a0 + 0f549d2
commit 9776e92
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.idea/misc.xml b/.idea/misc.xml
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
@@ -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