Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.
This commit is contained in:
11
.idea/libraries/hamcrest_core_1_3.xml
generated
Normal file
11
.idea/libraries/hamcrest_core_1_3.xml
generated
Normal file
@@ -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>
|
||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user