Code

Resolve merge conflict in PR #225#242

Code

Merged

wizzat merged 1 commit intodpkp:masterdpkp/kafka-python:masterfrom wizzat:pr_225wizzat/kafka-python:pr_225Copy head branch name to clipboardSep 23, 2014

+1-1

Commits

Commits on Sep 23, 2014

• Resolve merge conflict in PR dpkp#225

  

  Mark Roberts

  committed
  2fb6e23