X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=fc918f4d51383646181e8ee6712acb2ee207d7c4;hb=refs%2Fheads%2Fpython2;hp=476113ad59f66a0d0ac8f5cad2047e85f1f3902e;hpb=e216962e64bbfd0377511f456edc40570f8efb46;p=wrw.git

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