From 2530088bed7301cf3ebcf5fcfc5216386ae7897e Mon Sep 17 00:00:00 2001
From: ailsoncgt <acgt@cin.ufpe.br>
Date: Sat, 17 Sep 2016 20:20:28 -0300
Subject: [PATCH] Fix conflit

---
 courses/templates/course/create.html | 30 ------------------------------
 1 file changed, 0 insertions(+), 30 deletions(-)

diff --git a/courses/templates/course/create.html b/courses/templates/course/create.html
index 05ed941..4bd19d4 100644
--- a/courses/templates/course/create.html
+++ b/courses/templates/course/create.html
@@ -11,35 +11,6 @@
 {% endblock %}
 
 {% block content %}
-
-<<<<<<< HEAD
-	<form method="post" action="" enctype="multipart/form-data">
-		{% csrf_token %}
-		{% for field in form %}
-			<div class="form-group{% if form.has_error %} has-error {% endif %}">
-				<label for="{{ field.auto_id }}">{{ field.label }}</label>
-				{% render_field field class='form-control input-sm' %}
-				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-				{% if field.errors.length > 0 %}
-					<div class="alert alert-danger alert-dismissible" role="alert">
-	  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-	  						<span aria-hidden="true">&times;</span>
-  						</button>
-						<ul>
-							{% for error in field.errors %}
-								<li>{{ error }}</li>
-							{% endfor %}
-						</ul>
-					</div>
-				</div>
-				{% endif %}
-			</div>
-		{% endfor %}
-
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
-	</form>
-	<br clear="all" />
-=======
 </br>
 <div class="card card-content">
         <div class="card-body">
@@ -90,5 +61,4 @@
 </br>
 </br>
 </br>
->>>>>>> 841817e1db11c57551cb8e21bf361e5bf6c9d982
 {% endblock %}
--
libgit2 0.21.2