* [build] fix conflect
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/42285f33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/42285f33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/42285f33 Branch: refs/heads/0.16-dev Commit: 42285f337afe98f3876504ad29fc913e422e79a6 Parents: e903fe8 Author: Hanks <zhanghan...@gmail.com> Authored: Fri Aug 11 17:13:14 2017 +0800 Committer: Hanks <zhanghan...@gmail.com> Committed: Fri Aug 11 17:13:14 2017 +0800 ---------------------------------------------------------------------- package.json | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/42285f33/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 4accf9e..6fa9019 100644 --- a/package.json +++ b/package.json @@ -105,13 +105,7 @@ "semver": "^5.1.0", "weex-picker": "^0.1.0", "weex-rax-framework": "0.4.7", -<<<<<<< HEAD - "weex-vue-framework": "2.4.2-weex.3", - "weex-styler": "^0.2.2" -======= - "weex-styler": "0.1.9", "weex-vue-framework": "2.4.2-weex.3" ->>>>>>> 0.16-dev }, "devDependencies": { "@weex-project/weex-picker": "^0.2.4",