fix merge conflict

2020-08-27 15:54:21 +00:00
parent 488ef97ba6
commit c9491f4d43
3 changed files with 6 additions and 11 deletions
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -235,12 +235,15 @@ class Event(Post):

    class Meta:
        proxy = True
+
    @property
-    def event_start_month (self):
+    def event_start_month(self):
        return self.event_start.strftime("%b")
+
    @property
    def event_start_day(self):
        return self.event_start.strftime("%d")
+
    def save(self, *args, **kwargs):
        self.is_event = True