fix merge conflict

fet2020/documents/__init__.py

@@ -8,7 +8,6 @@ t = datetime.now() + timedelta(days=1)
 SERVER_URL = "https://etherpad2.2020.fet.at/"
 
 
-
 with open("/srv/andis_test/etherpad_test2/etherpad-lite/APIKEY.txt", "r") as f:
     k = f.read()
     epc = EtherpadLiteClient(

fet2020/posts/models.py

@@ -235,12 +235,15 @@ class Event(Post):
 
     class Meta:
         proxy = True
+
     @property
     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
 

fet2020/posts/views.py

@@ -49,19 +49,13 @@ def show(request, id=None):
     }
     response = render(request, 'posts/show.html', context)
     response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
-<<<<<<< HEAD
-    ep_sessid, expires=get_ep_sessionid(request)
-    response.set_cookie("sessionID",ep_sessid,expires=expires, domain=".2020.fet.at", path="/")
-    #response.set_cookie("express_sid",ep_sessid,expires=expires, domain="https://andis.2020.fet.at",path="/etherpad")
-    #response=add_ep_to_response(request, response  )
-=======
     ep_sessid, expires = get_ep_sessionid(request)
     response.set_cookie(
         "sessionID",
         ep_sessid,
         expires=expires,
         domain=".2020.fet.at",
-        path="/etherpad"
+        path="/"
     )
     '''
     response.set_cookie(
@@ -73,7 +67,6 @@ def show(request, id=None):
     )
     '''
     # response=add_ep_to_response(request, response  )
->>>>>>> a9b7ca5faead194ba253fadc59f6f1d83a8e5bc1
 
     return response