From 72d4fa2bc95fe4ce74b2b69137c0d3f69c95b7d6 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Fri, 19 Oct 2018 22:13:38 +0200
Subject: [PATCH] remove empty line from merge conflict

---
 core/admin/mailu/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 08ce8e8c..3653011f 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -278,7 +278,6 @@ class User(Base, Email):
         else:
             return self.email
 
-
     @property
     def reply_active(self):
         now = date.today()