2018-04-16 13:40:41 +02:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
|
<project version="4">
|
2018-04-16 13:46:07 +02:00
|
|
|
<<<<<<< HEAD
|
2018-04-16 13:40:41 +02:00
|
|
|
<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>
|
2018-04-16 13:46:07 +02:00
|
|
|
=======
|
2018-04-16 01:38:30 +02:00
|
|
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
2018-04-16 13:46:07 +02:00
|
|
|
>>>>>>> e31307eb015ce4a67ca5cbf51755ecb654024a62
|
2018-04-16 13:40:41 +02:00
|
|
|
</project>
|
