remove conflict cruft

Author: runestonetest

views/_sphinx_static_files.html

@@ -22,11 +22,6 @@
 <script type="text/javascript" src="{{=base_static_url}}/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.js"></script>
 
-<<<<<<< HEAD
-=======
-<link href="{{=base_static_url}}/codemirror.css" rel="stylesheet" type="text/css"/>
-<script src="{{=base_static_url}}/underscore.js"></script>
->>>>>>> master
 <link rel="stylesheet" type="text/css" href="{{=URL('static', 'jquery.datetimepicker.min.css')}}" />
 <link href="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css"/>
 <link rel="stylesheet" href="{{=base_static_url}}/pygments.css" type="text/css"/>
@@ -169,6 +164,10 @@
     .gradeablerow:hover {
         background-color: #cccccc;
     }
+    .gradeablerow {
+        color: blue;
+        text-decoration: underline;
+    }
 </style>