diff options
| author | Mark Roberts <wizzat@fb.com> | 2014-09-23 14:12:30 -0700 |
|---|---|---|
| committer | Mark Roberts <wizzat@fb.com> | 2014-09-23 14:12:30 -0700 |
| commit | 2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9 (patch) | |
| tree | 887cd8e9ec1603a959161d5d6834b8eef2e1ab1a /setup.py | |
| parent | 29f5619385bd26034a21bfb5fd0b827291adb8e4 (diff) | |
| download | kafka-python-2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9.tar.gz | |
Resolve merge conflict in PR #225
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions