remove empty line from merge conflict

6 years ago · 72d4fa2bc9
parent 857ad50509
commit 72d4fa2bc9
1 changed files with 0 additions and 1 deletions
--- 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()