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 -
- {% csrf_token %} - {% for field in form %} -
- - {% render_field field class='form-control input-sm' %} - {{ field.help_text }} - {% if field.errors.length > 0 %} - -
- {% endif %} - - {% endfor %} - - -
-
-======= -
@@ -88,7 +58,4 @@

-
-
->>>>>>> 841817e1db11c57551cb8e21bf361e5bf6c9d982 {% endblock %} -- libgit2 0.21.2