[GitHub] incubator-weex-site pull request #136: Resolve the conflict document

[balloonzzq]

Github user balloonzzq closed the pull request at:

    https://github.com/apache/incubator-weex-site/pull/136


---