ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Sam Potts 2019-01-26 16:54:04 +11:00
parent 1f0a74f3d5
commit a64a84f2fe
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demo/index.html
View File

@ -33,11 +33,7 @@
<meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:card" content="summary_large_image" />
<!-- Docs styles --> <!-- Docs styles -->
<<<<<<< HEAD <link rel="stylesheet" href="dist/demo.css" />
<link rel="stylesheet" href="dist/demo.css?v=2" />
=======
<link rel="stylesheet" href="dist/demo.css?2" />
>>>>>>> master
<!-- Preload --> <!-- Preload -->
<link <link
@ -274,11 +270,7 @@
<!-- Polyfills --> <!-- Polyfills -->
<script <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,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" crossorigin="anonymous"
></script> ></script>
@ -292,9 +284,6 @@
<script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script> <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script>
<!-- Docs 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 async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script>
<script> <script>
if (window.location.host === 'plyr.io') { if (window.location.host === 'plyr.io') {
@ -306,7 +295,6 @@
gtag('config', 'UA-132699580-1'); gtag('config', 'UA-132699580-1');
} }
</script> </script>
<script src="dist/demo.js?2" crossorigin="anonymous"></script> <script src="dist/demo.js" crossorigin="anonymous"></script>
>>>>>>> master
</body> </body>
</html> </html>