From 7134f1eda1a3f1703ad67c682597704eddf2a0d3 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 13 May 2020 01:57:12 +0200
Subject: [PATCH] Fixed erroneous merge.

---
 wrw/session.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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"]
 
-- 
2.11.0