Conflicts: diesel/__init__.py diesel/app.py diesel/client.py diesel/console.py diesel/convoy/__init__.py diesel/convoy/consensus/client.py diesel/convoy/consensus/server.py diesel/core.py diesel/protocols/dreadlock.py diesel/protocols/http/core.py diesel/protocols/http/pool.py diesel/protocols/mongodb.py diesel/protocols/pg.py diesel/protocols/redis.py diesel/protocols/riak.py diesel/protocols/websockets.py diesel/util/streams.py diesel/web.py examples/clocker.py examples/combined.py examples/combined_tls.py examples/consolechat.py examples/convoy.py examples/dreadlocks.py examples/zeromq_echo_service.py
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments.