Skip to content

E
edx-platform
Commit b8163856 by Joe Blaylock
Options

Stanford bad merge tag fix

parent 0dea8326
Showing with 0 additions and 1 deletions
lms/templates/main_django.html
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% load compressed %}{% load sekizai_tags i18n %}{% load url from future %}{% load staticfiles %} {% load compressed %}{% load sekizai_tags i18n %}{% load url from future %}{% load staticfiles %}
<html> <html>
<head> <head>
<<<<<<< HEAD
{% block title %} {% block title %}
{% if THEME_NAME == "stanford" %} {% if THEME_NAME == "stanford" %}
<title>Home | class.stanford.edu</title> <title>Home | class.stanford.edu</title>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment