From b8100ba2410f007ec3f479ce52cc83175bbff236 Mon Sep 17 00:00:00 2001
From: Logan Page <page.lg@gmail.com>
Date: Sat, 1 Apr 2017 17:41:10 +0200
Subject: [PATCH] remove trailing whitespace and remove old conflict indicator

---
 .../formgrader/static/css/formgrade.css               | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nbgrader/server_extensions/formgrader/static/css/formgrade.css b/nbgrader/server_extensions/formgrader/static/css/formgrade.css
index 35077f250..97d928050 100644
--- 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;
 }