aboutsummaryrefslogtreecommitdiffstats
path: root/demo
diff options
context:
space:
mode:
Diffstat (limited to 'demo')
-rw-r--r--demo/index.html16
1 files changed, 2 insertions, 14 deletions
diff --git a/demo/index.html b/demo/index.html
index cc2f3bfc..a99ef149 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -33,11 +33,7 @@
<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
+ <link rel="stylesheet" href="dist/demo.css" />
<!-- Preload -->
<link
@@ -274,11 +270,7 @@
<!-- 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>
@@ -292,9 +284,6 @@
<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') {
@@ -306,7 +295,6 @@
gtag('config', 'UA-132699580-1');
}
</script>
- <script src="dist/demo.js?2" crossorigin="anonymous"></script>
->>>>>>> master
+ <script src="dist/demo.js" crossorigin="anonymous"></script>
</body>
</html>