1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-07-15 01:24:34 +02:00

remove empty line from merge conflict

This commit is contained in:
hoellen
2018-10-19 22:13:38 +02:00
committed by GitHub
parent 857ad50509
commit 72d4fa2bc9

View File

@ -278,7 +278,6 @@ class User(Base, Email):
else:
return self.email
@property
def reply_active(self):
now = date.today()