From cf676b58fc5cd835500f3cc8979bffd1cb857fee Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 17 Apr 2020 20:29:50 +0200
Subject: [PATCH] Fix merge mistake
---
aleksis/core/models.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index b9b29ea5f..8d9991f03 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -265,12 +265,11 @@ class Group(ExtensibleModel):
blank=True,
)
-<<<<<<< HEAD
+ type = models.ForeignKey("GroupType", on_delete=models.CASCADE, related_name="type", verbose_name=_("Type of group"), null=True, blank=True)
+
+
def get_absolute_url(self) -> str:
return reverse("group_by_id", args=[self.id])
-=======
- type = models.ForeignKey("GroupType", on_delete=models.CASCADE, related_name="type", verbose_name=_("Type of group"), null=True, blank=True)
->>>>>>> master
@property
def announcement_recipients(self):
--
GitLab