From 2fc93b90f76c937979996fa64c2ca942db71c0bf Mon Sep 17 00:00:00 2001
From: Simen Moen Storvik <simenms@stud.ntnu.no>
Date: Wed, 13 Sep 2017 15:30:36 +0200
Subject: [PATCH] Fuck shit stack
---
.idea/workspace.xml | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8aaa8ae..f658ca5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -18,11 +18,7 @@
<entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
<provider selected="true" editor-type-id="text-editor">
<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="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
->>>>>>> origin/master
<folding />
</state>
</provider>
@@ -472,11 +468,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
-<<<<<<< HEAD
- <option name="totallyTimeSpent" value="821000" />
-=======
<option name="totallyTimeSpent" value="1380000" />
->>>>>>> origin/master
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
@@ -566,29 +558,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
<provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/ExperimentalClass.java">
- <provider selected="true" editor-type-id="text-editor">
- <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" />
-=======
<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 />
</state>
</provider>
--
GitLab