remove trailing whitespace and remove old conflict indicator

elhele · Apr 1, 2017 · b8100ba · b8100ba
1 parent 0667731
commit b8100ba
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/nbgrader/server_extensions/formgrader/static/css/formgrade.css b/nbgrader/server_extensions/formgrader/static/css/formgrade.css
@@ -60,14 +60,14 @@ div#notebook-container {
   div.cell {
     display: block;
     page-break-inside: avoid;
-  } 
-  div.output_wrapper { 
+  }
+  div.output_wrapper {
     display: block;
-    page-break-inside: avoid; 
+    page-break-inside: avoid;
   }
-  div.output { 
+  div.output {
     display: block;
-    page-break-inside: avoid; 
+    page-break-inside: avoid;
   }
 }
 
@@ -133,7 +133,6 @@ div.nbgrader_cell .input_area {
     overflow: hidden;
 }
 
-<<<<<<< HEAD
 .scoring-buttons button {
   background-color: #337ab7;
 }