Skip to content
Snippets Groups Projects
Commit 3c20dda3 authored by Simen Moen Storvik's avatar Simen Moen Storvik
Browse files

LEIF

parents 1c45d37e d39ec9ec
Branches
No related tags found
1 merge request!2Herre fette gud
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="509a4996-22c0-41b1-85a2-773d06041e9b" name="Default" comment="" /> <list default="true" id="509a4996-22c0-41b1-85a2-773d06041e9b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -16,7 +18,11 @@ ...@@ -16,7 +18,11 @@
<entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java"> <entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<<<<<<< HEAD
<caret line="0" column="25" lean-forward="false" selection-start-line="0" selection-start-column="25" selection-end-line="0" selection-end-column="25" /> <caret line="0" column="25" lean-forward="false" selection-start-line="0" selection-start-column="25" selection-end-line="0" selection-end-column="25" />
=======
<caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
>>>>>>> origin/master
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -461,12 +467,16 @@ ...@@ -461,12 +467,16 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1505298627081</updated> <updated>1505298627081</updated>
<workItem from="1505298630126" duration="752000" /> <workItem from="1505298630126" duration="752000" />
<workItem from="1505307974293" duration="64000" /> <workItem from="1505307974293" duration="628000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<<<<<<< HEAD
<option name="totallyTimeSpent" value="821000" /> <option name="totallyTimeSpent" value="821000" />
=======
<option name="totallyTimeSpent" value="1380000" />
>>>>>>> origin/master
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" /> <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
...@@ -556,6 +566,7 @@ ...@@ -556,6 +566,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java"> <entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="42"> <state relative-caret-position="42">
<caret line="2" column="41" lean-forward="false" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" /> <caret line="2" column="41" lean-forward="false" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
<folding /> <folding />
...@@ -574,6 +585,10 @@ ...@@ -574,6 +585,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="25" lean-forward="false" selection-start-line="0" selection-start-column="25" selection-end-line="0" selection-end-column="25" /> <caret line="0" column="25" lean-forward="false" selection-start-line="0" selection-start-column="25" selection-end-line="0" selection-end-column="25" />
=======
<state relative-caret-position="0">
<caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
>>>>>>> origin/master
<folding /> <folding />
</state> </state>
</provider> </provider>
......
class ExperimentalClass{} class ExperimentalClass{
\ No newline at end of file public static void main(String[] args) {
System.out.println("Hello, world!");
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment