resolve conflicts

yuche · yuche · commit 2ef629fb3266 · 2017-08-28T11:20:10.000+08:00
diff --git a/index.html b/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
 <!DOCTYPE html><html><head> <title>JS-Framkeworks Benchmark</title> <meta charset="UTF-8"> <link href="css/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> <link rel="stylesheet" href="css/main.css"> <meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="container"> <div class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title">Choose a framework:</h3> </div> <div class="panel-body"> <ul class="nav nav-pills nav-stacked"> <li><a href="nerv"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> nerv</a></li> <li><a href="anu"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> anu</a></li> <li><a href="preact-v7.1.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> preact-v7.1.0-keyed</a></li> <li><a href="react-v15.5.4-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-keyed</a></li> <li><a href="react-v16.beta2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v16.beta2-keyed</a></li> <li><a href="vue-v2.3.3-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vue-v2.3.3-keyed</a></li> </ul> </div> </div> <div class="panel panel-default"> <div class="panel-body"> <ul class="nav nav-pills nav-stacked"> <li><a href="webdriver-ts/table.html"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> Table Report</a></li> <li><a href="webdriver-ts-results/table.html"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> Interactive Table Report</a></li> </ul> </div> </div></div></body></html>
-=======
-<!DOCTYPE html><html><head> <title>JS-Framkeworks Benchmark</title> <meta charset="UTF-8"> <link href="css/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> <link rel="stylesheet" href="css/main.css"> <meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="container"> <div class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title">Choose a framework:</h3> </div> <div class="panel-body"> <ul class="nav nav-pills nav-stacked"> <li><a href="angular-v1.6.3-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> angular-v1.6.3-keyed</a></li> <li><a href="angular-v4.3.3-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> angular-v4.3.3-keyed</a></li> <li><a href="angular-v4.3.3-no-zone-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> angular-v4.3.3-no-zone-keyed</a></li> <li><a href="angular-v4.3.3-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> angular-v4.3.3-non-keyed</a></li> <li><a href="aurelia-v1.1.2-non-keyed/dist"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> aurelia-v1.1.2-non-keyed</a></li> <li><a href="binding.scala-v10.0.1-keyed/target/web/stage"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> binding.scala-v10.0.1-keyed</a></li> <li><a href="bobril-v7.1.2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> bobril-v7.1.2-keyed</a></li> <li><a href="choo-v5.4.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> choo-v5.4.0-non-keyed</a></li> <li><a href="cyclejs-dom-v17.1.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> cyclejs-dom-v17.1.0-non-keyed</a></li> <li><a href="datum-v0.8.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> datum-v0.8.0-non-keyed</a></li> <li><a href="dio-v7.0.1-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> dio-v7.0.1-keyed</a></li> <li><a href="dio-v7.0.1-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> dio-v7.0.1-non-keyed</a></li> <li><a href="dojo2-v2.0.0.beta2.5-keyed/dist"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> dojo2-v2.0.0.beta2.5-keyed</a></li> <li><a href="domvm-v3.0.5-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> domvm-v3.0.5-non-keyed</a></li> <li><a href="domvm-v3.0.5-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> domvm-v3.0.5-keyed</a></li> <li><a href="elm-v0.18.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> elm-v0.18.0-keyed</a></li> <li><a href="etch-v0.12.5-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> etch-v0.12.5-keyed</a></li> <li><a href="etch-v0.12.5-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> etch-v0.12.5-non-keyed</a></li> <li><a href="ember-v2.13.0-keyed/dist"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ember-v2.13.0-keyed</a></li> <li><a href="etch-v0.12.5-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> etch-v0.12.5-keyed</a></li> <li><a href="etch-v0.12.5-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> etch-v0.12.5-non-keyed</a></li> <li><a href="glimmer-v0.3.10-keyed/dist"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> glimmer-v0.3.10-keyed</a></li> <li><a href="halogen-v2.1.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> halogen-v2.1.0-non-keyed</a></li> <li><a href="hyperapp-v0.9.1-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> hyperapp-v0.9.1-non-keyed</a></li> <li><a href="halogen-v2.1.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> halogen-v2.1.0-non-keyed</a></li> <li><a href="inferno-v3.1.2-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> inferno-v3.1.2-non-keyed</a></li> <li><a href="inferno-v3.1.2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> inferno-v3.1.2-keyed</a></li> <li><a href="ivi-v0.8.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ivi-v0.8.0-keyed</a></li> <li><a href="knockout-v3.4.1-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> knockout-v3.4.1-keyed</a></li> <li><a href="marionette-v3.4.0-domapi-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> marionette-v3.4.0-domapi-keyed</a></li> <li><a href="marionette-v3.4.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> marionette-v3.4.0-keyed</a></li> <li><a href="marionette-v3.4.2-domapi-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> marionette-v3.4.2-domapi-keyed</a></li> <li><a href="marionette-v3.4.2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> marionette-v3.4.2-keyed</a></li> <li><a href="marko-v4.3.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> marko-v4.3.0-keyed</a></li> <li><a href="mithril-v1.1.1-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> mithril-v1.1.1-keyed</a></li> <li><a href="moon-v0.11.0"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> moon-v0.11.0</a></li> <li><a href="nx-v1.0.0-beta.2.0.1-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> nx-v1.0.0-beta.2.0.1-keyed</a></li> <li><a href="nx-v1.0.0-beta.2.0.1-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> nx-v1.0.0-beta.2.0.1-non-keyed</a></li> <li><a href="petit-dom-v0.0.5-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> petit-dom-v0.0.5-keyed</a></li> <li><a href="pico-dom-v1.0.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> pico-dom-v1.0.0-keyed</a></li> <li><a href="plastiq-v1.33.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> plastiq-v1.33.0-keyed</a></li> <li><a href="polymer-v2.0.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> polymer-v2.0.0-non-keyed</a></li> <li><a href="preact-v7.1.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> preact-v7.1.0-keyed</a></li> <li><a href="ractive-v0.8.12-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ractive-v0.8.12-keyed</a></li> <li><a href="ractive-v0.8.12-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ractive-v0.8.12-non-keyed</a></li> <li><a href="ractive-edge-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ractive-edge-keyed</a></li> <li><a href="ractive-edge-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> ractive-edge-non-keyed</a></li> <li><a href="react-lite-v0.15.30-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-lite-v0.15.30-keyed</a></li> <li><a href="react-v15.5.4-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-keyed</a></li> <li><a href="react-v15.5.4-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-non-keyed</a></li> <li><a href="react-v15.5.4-easy-state-v1.0.3-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-easy-state-v1.0.3-keyed</a></li> <li><a href="react-v15.5.4-mobX-v3.1.9-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-mobX-v3.1.9-keyed</a></li> <li><a href="react-v15.5.4-redux-v3.6.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v15.5.4-redux-v3.6.0-keyed</a></li> <li><a href="react-v16.beta2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> react-v16.beta2-keyed</a></li> <li><a href="redom-v3.0.2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> redom-v3.0.2-keyed</a></li> <li><a href="redom-v3.0.2-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> redom-v3.0.2-non-keyed</a></li> <li><a href="riot-v3.5.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> riot-v3.5.0-non-keyed</a></li> <li><a href="rx-domh-v0.0.2-rxjs-v5.3.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> rx-domh-v0.0.2-rxjs-v5.3.0-keyed</a></li> <li><a href="simulacra-v2.1.5-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> simulacra-v2.1.5-non-keyed</a></li> <li><a href="slim-js-v2.9.1-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> slim-js-v2.9.1-non-keyed</a></li> <li><a href="stem-v0.2.70-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> stem-v0.2.70-non-keyed</a></li> <li><a href="surplus-v0.4.0-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> surplus-v0.4.0-keyed</a></li> <li><a href="surplus-v0.4.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> surplus-v0.4.0-non-keyed</a></li> <li><a href="svelte-v1.20.2-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> svelte-v1.20.2-keyed</a></li> <li><a href="svelte-v1.20.2-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> svelte-v1.20.2-non-keyed</a></li> <li><a href="tsers-v1.0.0-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> tsers-v1.0.0-non-keyed</a></li> <li><a href="vanillajs-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vanillajs-non-keyed</a></li> <li><a href="vanillajs-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vanillajs-keyed</a></li> <li><a href="vidom-v0.9.8-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vidom-v0.9.8-keyed</a></li> <li><a href="vue-v2.3.3-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vue-v2.3.3-keyed</a></li> <li><a href="vue-v2.3.3-non-keyed"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> vue-v2.3.3-non-keyed</a></li> </ul> </div> </div> <div class="panel panel-default"> <div class="panel-body"> <ul class="nav nav-pills nav-stacked"> <li><a href="webdriver-ts/table.html"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> Table Report</a></li> <li><a href="webdriver-ts-results/table.html"><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> Interactive Table Report</a></li> </ul> </div> </div></div></body></html>
->>>>>>> 2459e72e7adce2d34ec65738d8aff04c03a68cbe
diff --git a/webdriver-ts/src/common.ts b/webdriver-ts/src/common.ts
@@ -33,48 +33,7 @@ function f(name: string, keyed: boolean, options: Options = {uri: null, useShado
 }
 
 export let frameworks = [
-<<<<<<< HEAD
     f("inferno-v3.1.2-keyed", true),
-=======
-    f("angular-v1.6.3-keyed", true),
-    f("angular-v4.3.3-keyed", true),
-    f("angular-v4.3.3-no-zone-keyed", true),
-    f("angular-v4.3.3-non-keyed", false),
-    f("aurelia-v1.1.2-non-keyed", false, {uri: "aurelia-v1.1.2-non-keyed/dist"}),
-    f("binding.scala-v10.0.1-keyed", true, {uri: "binding.scala-v10.0.1-keyed/target/web/stage"}),
-    f("bobril-v7.1.2-keyed", true),
-    f("choo-v5.4.0-non-keyed", false),
-    f("cyclejs-dom-v17.1.0-non-keyed", false),
-    f("datum-v0.8.0-non-keyed", false),
-    f("dio-v7.0.1-keyed", true),
-    f("dio-v7.0.1-non-keyed", false),
-    f("dojo2-v2.0.0.beta2.5-keyed", true, {uri: "dojo2-v2.0.0.beta2.5-keyed/dist"}),
-    f("domvm-v3.0.5-non-keyed", false),
-    f("domvm-v3.0.5-keyed", true),
-    f("elm-v0.18.0-keyed", true),
-    f("ember-v2.13.0-keyed", true, {uri: "ember-v2.13.0-keyed/dist"}),
-    f("etch-v0.12.5-keyed", true),
-    f("etch-v0.12.5-non-keyed", false),
-    f("glimmer-v0.3.10-keyed", true, {uri: "glimmer-v0.3.10-keyed/dist"}),
-    f("halogen-v2.1.0-non-keyed", false),
-    f("hyperapp-v0.9.1-non-keyed", false),
-    f("halogen-v2.1.0-non-keyed", false),
-    f("inferno-v3.1.2-non-keyed", false),
-    f("inferno-v3.1.2-keyed", true),
-    f("ivi-v0.8.0-keyed", true),
-    f("knockout-v3.4.1-keyed", true),
-    f("marionette-v3.4.2-domapi-keyed", true),
-    f("marionette-v3.4.2-keyed", true),
-    f("marko-v4.3.0-keyed", true),
-    f("mithril-v1.1.1-keyed", true),
-    f("moon-v0.11.0", false),
-    f("nx-v1.0.0-beta.2.0.1-keyed", true),
-    f("nx-v1.0.0-beta.2.0.1-non-keyed", false),
-    f("petit-dom-v0.0.5-keyed", true),
-    f("pico-dom-v1.0.0-keyed", true),
-    f("plastiq-v1.33.0-keyed", true),
-    f("polymer-v2.0.0-non-keyed", false, {uri: "polymer-v2.0.0-non-keyed", useShadowRoot: true}),
->>>>>>> 2459e72e7adce2d34ec65738d8aff04c03a68cbe
     f("preact-v7.1.0-keyed", true),
     f("react-lite-v0.15.30-keyed", true),
     f("react-v15.5.4-keyed", true),
diff --git a/webdriver-ts/table.html b/webdriver-ts/table.html
