diff options
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"]) |