From 5e7667aa312345c62e328f0c590bd494b35c0c16 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Sat, 6 Apr 2019 16:45:42 -0600
Subject: [PATCH] Merge branch 'master' of C:\Users\Harkamal
 Randhawa\IdeaProjects\TaipanClone with conflicts.

---
 .idea/libraries/hamcrest_core_1_3.xml | 11 +++++++++++
 .idea/misc.xml                        |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .idea/libraries/hamcrest_core_1_3.xml

diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml
new file mode 100644
index 0000000..1b92cf2
--- /dev/null
+++ b/.idea/libraries/hamcrest_core_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="hamcrest-core-1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/src/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/jfxrt.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c496ad9..29ec0d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
   <component name="ProjectKey">
     <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">