diff options
| author | Viktor Shlapakov <vshlapakov@gmail.com> | 2015-03-24 22:21:13 +0300 |
|---|---|---|
| committer | Viktor Shlapakov <vshlapakov@gmail.com> | 2015-06-03 11:22:47 +0300 |
| commit | 5e8dc6dcf55890a4e3a214a943ecc655faed3ecc (patch) | |
| tree | f5ec10c67ec6c0e48971e2f973f4768807693ca7 /kafka/common.py | |
| parent | b0a04595c6aee7f6fcaa8927fcdfcd9a04a9b7d3 (diff) | |
| download | kafka-python-5e8dc6dcf55890a4e3a214a943ecc655faed3ecc.tar.gz | |
Fixed tests and other issues after rebase
Diffstat (limited to 'kafka/common.py')
| -rw-r--r-- | kafka/common.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kafka/common.py b/kafka/common.py index b3380d7..5c2b788 100644 --- a/kafka/common.py +++ b/kafka/common.py @@ -6,7 +6,6 @@ from collections import namedtuple # Structs # ############### -<<<<<<< HEAD # https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol#AGuideToTheKafkaProtocol-MetadataAPI MetadataRequest = namedtuple("MetadataRequest", ["topics"]) |