[DEV] Updating gh-pages

DEWITTE Pierre-Alban · DEWITTE Pierre-Alban · commit 175bfc20cdd7 · 2016-06-30T10:19:55.000+02:00
diff --git a/bower.json b/bower.json
@@ -40,6 +40,7 @@
     "paper-item": "PolymerElements/paper-item#1.1.x"
   },
   "resolutions": {
-    "myscript": "master"
+    "myscript": "master",
+    "polymer": "1.4.x"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`"paper-item": "PolymerElements/paper-item#1.1.x"`
`41`	`41`	`},`
`42`	`42`	`"resolutions": {`
`43`		`- "myscript": "master"`
	`43`	`+ "myscript": "master",`
	`44`	`+ "polymer": "1.4.x"`
`44`	`45`	`}`
`45`	`46`	`}`