Download as
Browse Code »

Commit 93a93cd1d2882154f4a080e9eaf56d5f8769dcd7

Authored by Matheus Lins
1 parent 9323197a
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixing conflit

Showing 1 changed file with 0 additions and 33 deletions   Show diff stats
courses/templates/course/create.html
  Diff comments   View file @93a93cd
... ... @@ -11,36 +11,6 @@
11 11 {% endblock %}
12 12  
13 13 {% block content %}
14   -
15   -<<<<<<< HEAD
16   - <form method="post" action="" enctype="multipart/form-data">
17   - {% csrf_token %}
18   - {% for field in form %}
19   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
20   - <label for="{{ field.auto_id }}">{{ field.label }}</label>
21   - {% render_field field class='form-control input-sm' %}
22   - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
23   - {% if field.errors.length > 0 %}
24   - <div class="alert alert-danger alert-dismissible" role="alert">
25   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
26   - <span aria-hidden="true">&times;</span>
27   - </button>
28   - <ul>
29   - {% for error in field.errors %}
30   - <li>{{ error }}</li>
31   - {% endfor %}
32   - </ul>
33   - </div>
34   - </div>
35   - {% endif %}
36   - </div>
37   - {% endfor %}
38   -
39   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
40   - </form>
41   - <br clear="all" />
42   -=======
43   -</br>
44 14 <div class="card card-content">
45 15 <div class="card-body">
46 16 <form method="post" action="" enctype="multipart/form-data">
... ... @@ -88,7 +58,4 @@
88 58 </div>
89 59 </div>
90 60 </br>
91   -</br>
92   -</br>
93   ->>>>>>> 841817e1db11c57551cb8e21bf361e5bf6c9d982
94 61 {% endblock %}
... ...