From 02b40e3b396f1520bbdcb57babda81495c3aa759 Mon Sep 17 00:00:00 2001
From: RedstoneTechnik <andresitek@yahoo.com>
Date: Mon, 18 Feb 2019 20:46:00 +0100
Subject: [PATCH] Merge branch 'master' of
 C:\Users\andre\Desktop\WarShipFactory1 with conflicts.

---
 .idea/WarShipFactory1.iml | 9 +++++++++
 .idea/misc.xml            | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 .idea/WarShipFactory1.iml
 create mode 100644 .idea/misc.xml

diff --git a/.idea/WarShipFactory1.iml b/.idea/WarShipFactory1.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/WarShipFactory1.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..902897b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file