From 9d8f781aead7e15ae7dab53e7dd33f8e7ce1780c Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 22 Sep 2016 15:41:03 -0400
Subject: [bug] fix bad merge in imports block

---
 server/src/leap/soledad/server/sync.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'server')

diff --git a/server/src/leap/soledad/server/sync.py b/server/src/leap/soledad/server/sync.py
index 533ce778..337d9ecf 100644
--- a/server/src/leap/soledad/server/sync.py
+++ b/server/src/leap/soledad/server/sync.py
@@ -17,23 +17,14 @@
 """
 Server side synchronization infrastructure.
 """
-<<<<<<< a64e0fad3a8b1a07887c567d99fd32e3dcf54b23
 import time
-from leap.soledad.common.l2db import sync
-from leap.soledad.common.l2db.remote import http_app
-from leap.soledad.server.caching import get_cache_for
-from leap.soledad.server.state import ServerSyncState
-from leap.soledad.common.document import ServerDocument
-from itertools import izip
-=======
 from itertools import izip
-import cjson
 
-from leap.soledad.common.l2db import sync, Document
+from leap.soledad.common.l2db import sync
 from leap.soledad.common.l2db.remote import http_app
 from leap.soledad.server.caching import get_cache_for
 from leap.soledad.server.state import ServerSyncState
->>>>>>> wip: adapt crypto to streaming flow
+from leap.soledad.common.document import ServerDocument
 
 
 MAX_REQUEST_SIZE = 6000  # in Mb
-- 
cgit v1.2.3