Browse Source

Fix editor.css

Lucas de Souza 4 years ago
parent
commit
3ecb597c85
1 changed files with 0 additions and 7 deletions
  1. 0 7
      css/ivprog-editor.css

+ 0 - 7
css/ivprog-editor.css

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