update

templates/login.html

@@ -3,8 +3,13 @@
 {% load crispy_forms_tags %}
 
 {% block main %}
+<<<<<<< HEAD
 <div class="col-lg-10 p-0 mb-1">
 	<div class="card text-white bg-secondary m-lg-5">
+=======
+<div class="col-lg-10">
+	<div class="card text-white bg-secondary m-5">
+>>>>>>> 27415e4e6fcc9fd8f9376bd018930df03eb919e3
 		{% if request.user.is_authenticated %}
 		<div class="card-header">Oups ! </div>
 		<div class="card-body">