Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Ledostuff committed Nov 19, 2018
1 parent 927d03e commit 870947f
Showing 1 changed file with 0 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public AdminClientWrapper(KafkaRestConfig kafkaRestConfig, AdminClient adminClie
}

public static Properties adminProperties(KafkaRestConfig kafkaRestConfig) {
this.kafkaRestConfig = kafkaRestConfig;
Properties properties = new Properties();
properties.putAll(kafkaRestConfig.getAdminProperties());
properties.put(KafkaRestConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaRestConfig.bootstrapBrokers());
Expand Down

0 comments on commit 870947f

Please sign in to comment.