stack created HTRACE-70:
---------------------------
Summary: Fix merge conflict in .gitignore on 3.1 branch
Key: HTRACE-70
URL: https://issues.apache.org/jira/browse/HTRACE-70
Project: HTrace
Issue Type: Bug
Reporter: stack-- This message was sent by Atlassian JIRA (v6.3.4#6332)
