Fix editor.css

css/ivprog-editor.css

@@ -1,10 +1,3 @@
-<<<<<<< HEAD
 .CodeMirror {
   height: 100% !important;
 }
-=======
-
-.CodeMirror {
-  height: 100% !important;
-}
->>>>>>> 1b62e4afcc3801dcf3732f220e24346153abcf08