GitHub user guozhangwang opened a pull request:
https://github.com/apache/kafka/pull/1922
HOTFIX: remove git conflicts
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/guozhangwang/kafka KHotfix-streams-html
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/kafka/pull/1922.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1922
----
commit b5aa255de60589ebce0c8a1aaa4f828bf1ae9bfe
Author: Guozhang Wang <wangg...@gmail.com>
Date: 2016-09-28T00:54:42Z
remove git info
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
