Merge correction

plugins/webui/run.py

@@ -44,18 +44,11 @@ def cookie_hash(token):
 #@return None or a session token
 def load_cookie(request):
     token = request.cookies.get(COOKIE_SESSION_ID)
-<<<<<<< HEAD
-    
-    if token is None or len(token) == 0:
-        return None
-    
-    token=token.encode()
-    
-=======
+
     if token is None or len(token) == 0:
         return None
     token=token.encode()
->>>>>>> 0fc8616c02ad999204e1e4926e9007c0ae7e035b
+
     hashtok = request.cookies.get(COOKIE_SESSION_HASH)
     if hashtok is None:
         raise ClientAuthenticationFailure(