Github user cdwijayarathna commented on the pull request:
https://github.com/apache/thrift/pull/166#issuecomment-50244330
@bufferoverflow We have merged commit e451b80 already. Only 0fdd214 needs
to be merged. Here it says "This pull request contains merge conflicts.". Is
there any issue? Please let me know if anything to be edited.
---
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.
---
