Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Simen Moen Storvik
ExperimentalProject
Commits
2fc93b90
Commit
2fc93b90
authored
Sep 13, 2017
by
Simen Moen Storvik
Browse files
Fuck shit stack
parent
3c20dda3
Changes
1
Hide whitespace changes
Inline
Side-by-side
.idea/workspace.xml
View file @
2fc93b90
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment