Fixed erroneous merge.

[wrw.git] / wrw / session.py

diff --git a/wrw/session.py b/wrw/session.py
index 476113a..fc918f4 100644 (file)
--- 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"]