fix merge

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()]