[GitHub] incubator-griffin pull request #150: 20171030 merge conflict fix

[asfgit]

Github user asfgit closed the pull request at:

    https://github.com/apache/incubator-griffin/pull/150


---