diff options
Diffstat (limited to 'demo/index.html')
| -rw-r--r-- | demo/index.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/demo/index.html b/demo/index.html index 4666bf8e..cc2f3bfc 100644 --- a/demo/index.html +++ b/demo/index.html @@ -33,7 +33,11 @@ <meta name="twitter:card" content="summary_large_image" /> <!-- Docs styles --> +<<<<<<< HEAD + <link rel="stylesheet" href="dist/demo.css?v=2" /> +======= <link rel="stylesheet" href="dist/demo.css?2" /> +>>>>>>> master <!-- Preload --> <link @@ -270,7 +274,11 @@ <!-- Polyfills --> <script +<<<<<<< HEAD + src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL,Math.trunc" +======= src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL" +>>>>>>> master crossorigin="anonymous" ></script> @@ -284,6 +292,9 @@ <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script> <!-- Docs script --> +<<<<<<< HEAD + <script src="dist/demo.js" crossorigin="anonymous"></script> +======= <script async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script> <script> if (window.location.host === 'plyr.io') { @@ -296,5 +307,6 @@ } </script> <script src="dist/demo.js?2" crossorigin="anonymous"></script> +>>>>>>> master </body> </html> |