Commit 87eb66e7 authored by Phil Hughes's avatar Phil Hughes

removed conflict markers

parent fd43419a
......@@ -68,8 +68,6 @@
}
}
<<<<<<< HEAD
=======
.ide-file-icon-holder {
display: flex;
align-items: center;
......@@ -83,7 +81,6 @@
}
}
>>>>>>> master
.ide-new-btn {
display: none;
margin-right: -8px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment