You've already forked Mailu
mirror of
https://github.com/Mailu/Mailu.git
synced 2025-11-23 22:04:47 +02:00
remove empty line from merge conflict
This commit is contained in:
@@ -278,7 +278,6 @@ class User(Base, Email):
|
||||
else:
|
||||
return self.email
|
||||
|
||||
|
||||
@property
|
||||
def reply_active(self):
|
||||
now = date.today()
|
||||
|
||||
Reference in New Issue
Block a user