diff --git a/css/main.css b/css/main.css
index fe31fb6..86121e8 100644
--- a/css/main.css
+++ b/css/main.css
@@ -43,16 +43,24 @@
}
#content {
-<<<<<<< HEAD
- margin-top: 33px;
- font-family: "Ubuntu Mono";
-=======
+ font-family: "Ubuntu Mono" !important;
margin-top: 50px;
margin-left: auto;
margin-right: auto;
width: 80%;
- border: 1px solid;
->>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3
+ border: none;
+}
+.CodeMirror-cursor {
+ background-color: #ffc40d !important;
+}
+
+.CodeMirror-code, .CodeMirror {
+ background-color: transparent !important;
+}
+
+.CodeMirror pre {
+ font-family: "Ubuntu Mono" !important;
+ font-size:10pt;
}
button {
diff --git a/type.html b/type.html
index af5f400..d4cadea 100644
--- a/type.html
+++ b/type.html
@@ -4,13 +4,9 @@
Type
-<<<<<<< HEAD
-=======
-
->>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3