From 353404b2983f40373e5f89785e10aa9665bfda9e Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Sun, 13 Sep 2020 08:25:03 +0000
Subject: [PATCH] fix merge

---
 fet2020/posts/models.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py
index 22a9c2c4..8da2cfe2 100644
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -100,7 +100,6 @@ class Post(models.Model):
 
     @property
     def agenda_html(self):
-<<<<<<< HEAD
         if not self.agenda_key:
             return None
         h=ep.getPadHTML(self.agenda_key)
@@ -113,13 +112,7 @@ class Post(models.Model):
         request_logger.info("set etherpad!")
         return value
         
-=======
-        return "<h1>Agenda</h1>"
 
-    # @agenda_html.setter
-    # def agenda_html_set(self, value):
-    #    return value
->>>>>>> 72b4b7d982139cd76d2d5389e7b906097d75a0c0
     @property
     def get_tagnames(self):
         return ["#%s" % t for t in self.tags.names()]