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