summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
Diffstat (limited to 'server/src')
-rw-r--r--server/src/leap/soledad/server/sync.py13
1 files changed, 2 insertions, 11 deletions
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