Github user blrunner commented on the pull request:

    https://github.com/apache/tajo/pull/599#issuecomment-112221427
  
    @charsyam 
    
    Thanks for your contribution.
    But I failed to merge this patch as following
    
    ```
    Auto-merging 
tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java
    Auto-merging 
tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResultResource.java
    CONFLICT (content): Merge conflict in 
tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResultResource.java
    Automatic merge failed; fix conflicts and then commit the result.
    ```
    
    Could you check it ?


---
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 [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to