Removed some accidental typing from gradebook.html

--HG-- branch : bridger-grades
2012-03-14 18:09:40 -04:00
parent a1f630470f
commit d8b596148c
1 changed files with 0 additions and 1 deletions
--- a/gradebook.html
+++ b/gradebook.html
@@ -1,4 +1,3 @@
-<<<<<<< local
 <%inherit file="main.html" />
 <%namespace name="profile_graphs" file="profile_graphs.js"/>