conflicts resolved

fiches/models.py

@@ -33,6 +33,9 @@ class Profile(models.Model):
     def __str__(self):
         return self.full_name
 
+    def birthday():
+        return self.birth_date.strftime("%d%m")
+
 
 class Department(models.Model):
     name = models.CharField(max_length=255, verbose_name=_("nom du département"))

fiches/templates/fiches/birthday.html

@@ -12,4 +12,5 @@
         </ul>
     </div>
 
+
 {% endblock %}

fiches/views.py

@@ -38,6 +38,7 @@ def fiche_modif(request):
 
     return render(request, "fiches/fiches_modif.html", {"form": form})
 
+
 @login_required
 def home(request):
     if request.method == "POST":