From d8b596148c4125ef6bfd26d1e9fbed911054dc14 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Wed, 14 Mar 2012 18:09:40 -0400
Subject: [PATCH] Removed some accidental typing from gradebook.html

--HG--
branch : bridger-grades
---
 gradebook.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradebook.html b/gradebook.html
index e4fe98152f..bf1430d657 100644
--- a/gradebook.html
+++ b/gradebook.html
@@ -1,4 +1,3 @@
-<<<<<<< local
 <%inherit file="main.html" />
 <%namespace name="profile_graphs" file="profile_graphs.js"/>