diff options
author | Kali Kaneko <kali@leap.se> | 2016-09-22 15:41:03 -0400 |
---|---|---|
committer | Victor Shyba <victor1984@riseup.net> | 2016-11-18 15:55:52 -0300 |
commit | 9d8f781aead7e15ae7dab53e7dd33f8e7ce1780c (patch) | |
tree | 6dda2a19369fc3e01c7800aeeab5cbd6f2a01e9c /server | |
parent | 624e05d56f6e1414a563bd146e468f08cf1be1ec (diff) |
[bug] fix bad merge in imports block
Diffstat (limited to 'server')
-rw-r--r-- | server/src/leap/soledad/server/sync.py | 13 |
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 |