fix some merge errors

fet2020/posts/views.py

@@ -49,35 +49,13 @@ def show(request, id=None):
         "next": get_next_dict().get(p.slug, None),
         "related_posts": p.tags.similar_objects(),
         "ep_link": get_pad_link(p.slug + "-agenda"),
-        "author_image": post_author[0].image['avatar'].url
+
     }
 
     response = render(request, 'posts/show.html', context)
-<<<<<<< HEAD
-    return add_ep_cookie(request,response)
-=======
-    response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
-    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  )
 
-    return response
->>>>>>> 7fff88d1679058b52a4e2804534ea2dc76782873
+    return add_ep_cookie(request,response)
+
 
 ###########
 # HELPERS #