fix conflict

Saneyan · Oct 18, 2017 · a1f0cb9 · a1f0cb9
2 parents b7e5217 + 98842ac
commit a1f0cb9
Show file tree

Hide file tree

Showing 4 changed files with 1,772 additions and 1,772 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "lazy-board",
   "description": "Session based routing and lazy HTML importing.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "authors": [
     "TADOKORO Saneyuki <[email protected]>"
@@ -14,12 +14,12 @@
     "web-components"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#^2.0.0-rc.7",
-    "iron-location": "polymerelements/iron-location#2.0-preview"
+    "polymer": "Polymer/polymer#^2.0.1",
+    "iron-location": "polymerelements/iron-location#^2.0.0"
   },
   "devDependencies": {
     "test-fixture": "PolymerElements/test-fixture#^3.0.0-rc.1",
-    "web-component-tester": "Polymer/web-component-tester#^6.0.0-prerelease.9",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.9"
+    "web-component-tester": "Polymer/web-component-tester#^6.0.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
   }
 }
diff --git a/lazy-board.html b/lazy-board.html
@@ -8,7 +8,7 @@
 
     <iron-location path="{{_path}}" query="{{_query}}"></iron-location>
     <iron-query-params
-        params-string="{{_query}}"
+        params-string="[[_query]]"
         params-object="{{_queryParams}}"></iron-query-params>
 
     <slot></slot>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lazy-board",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Session based routing and lazy HTML importing.",
   "author": {
     "name": "TADOKORO Saneyuki",