diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html index 05ed941..f934558 100644 --- a/courses/templates/course/create.html +++ b/courses/templates/course/create.html @@ -11,36 +11,6 @@ {% endblock %} {% block content %} - -<<<<<<< HEAD -
-