[05/47] incubator-weex git commit: Revert "* [html5] release vue-render 0.12.2"

[gurisxie]

Revert "* [html5] release vue-render 0.12.2"

This reverts commit bb844b90aa013ca946c6ffdce57a1281f5340374.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/486c6f4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/486c6f4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/486c6f4d

Branch: refs/heads/master
Commit: 486c6f4dffcb9865739731c34fbabf276395dd16
Parents: bb844b9
Author: MrRaindrop 
Authored: Mon Aug 21 11:31:55 2017 +0800
Committer: MrRaindrop 
Committed: Mon Aug 21 11:31:55 2017 +0800

--
 package.json | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/486c6f4d/package.json
--
diff --git a/package.json b/package.json
index 2148df1..4579a27 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,8 @@
   "version": "0.12.2",
   "subversion": {
 "browser": "0.5.0",
-<<< HEAD
 "framework": "0.21.9",
 "vue-render": "0.12.3",
-===
-"framework": "0.20.6",
-"vue-render": "0.12.2",
->>> 850811c... * [html5] release vue-render 0.12.2
 "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",

[05/47] incubator-weex git commit: Revert "* [html5] release vue-render 0.12.2"

[gurisxie]

Revert "* [html5] release vue-render 0.12.2"

This reverts commit bb844b90aa013ca946c6ffdce57a1281f5340374.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/486c6f4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/486c6f4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/486c6f4d

Branch: refs/heads/dev
Commit: 486c6f4dffcb9865739731c34fbabf276395dd16
Parents: bb844b9
Author: MrRaindrop 
Authored: Mon Aug 21 11:31:55 2017 +0800
Committer: MrRaindrop 
Committed: Mon Aug 21 11:31:55 2017 +0800

--
 package.json | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/486c6f4d/package.json
--
diff --git a/package.json b/package.json
index 2148df1..4579a27 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,8 @@
   "version": "0.12.2",
   "subversion": {
 "browser": "0.5.0",
-<<< HEAD
 "framework": "0.21.9",
 "vue-render": "0.12.3",
-===
-"framework": "0.20.6",
-"vue-render": "0.12.2",
->>> 850811c... * [html5] release vue-render 0.12.2
 "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",