From 8c5f0b1f95f75bdc45a2dfc5e6752abe5f18140a Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Thu, 11 Apr 2019 14:36:52 -0600
Subject: [PATCH] Merge branch 'master' of C:\Users\Harkamal
 Randhawa\IdeaProjects\TaipanClone with conflicts.

---
 .idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 29ec0d7..fa20b13 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_141" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">