GitHub user balloonzzq opened a pull request:
https://github.com/apache/incubator-weex-site/pull/136
Resolve the conflict document
Resolve the conflict document
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/balloonzzq/incubator-weex-site fixbug
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-weex-site/pull/136.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #136
----
commit 537a50a5cceaa6edd456def8325088183b91e71b
Author: balloonzzq <zqzhuang888@...>
Date: 2018-04-17T11:42:21Z
Resolve the conflict document
----
---
