fixed merge conflicts

This commit is contained in:
Alex Haynes
2018-10-21 14:28:02 -04:00
9 changed files with 76 additions and 29 deletions

View File

@ -3,8 +3,7 @@ import asyncio
class Stream(IStream):
def __init__(self, context, peer_id):
self.context = context
def __init__(self, peer_id):
self.peer_id = peer_id
peer_store = context.peer_store