From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 12 May 2020 23:57:12 +0000 (+0200)
Subject: Fixed erroneous merge.
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=7134f1eda1a3f1703ad67c682597704eddf2a0d3;p=wrw.git

Fixed erroneous merge.
---

diff --git a/wrw/session.py b/wrw/session.py
index 476113a..fc918f4 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,9 +1,5 @@
 import threading, time, pickle, random, os
-<<<<<<< HEAD
-import cookie, env
-=======
-from . import cookie, env, proto
->>>>>>> master
+import cookie, env, proto
 
 __all__ = ["db", "get"]