Browse Source

:twisted_rightwards_arrows: Merge branch 'dev_base' into dev_goback

zhanghe 6 years ago
parent
commit
acfaa006e2
1 changed files with 1 additions and 10 deletions
  1. 1 10
      src/stage/index/index.html

+ 1 - 10
src/stage/index/index.html

@@ -47,17 +47,8 @@
 			eid.dispatchEvent(evt);
 		}
 	</script>
-<<<<<<< HEAD
-	<!-- <script src="http://g.alicdn.com/de/alitv-debug/1.1.10/index.min.js"></script> -->
-	<script src="https://cdn.bootcss.com/crypto-js/3.1.9/core.min.js"></script>
-	<script src="https://cdn.bootcss.com/crypto-js/3.1.9/sha1.min.js"></script>
-	<script src="https://cdn.bootcss.com/crypto-js/3.1.9/md5.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
-	<script src="../../lib/js/FocusEngine.js"></script>
-=======
-	<script src="http://g.alicdn.com/de/alitv-debug/1.1.10/index.min.js"></script>
+	<!-- <script src="../../lib/js/alitv-debug.min.js"></script> -->
 	<script src="../../lib/js/FocusEngine.min.js"></script>
->>>>>>> dev_base
 	<script src="../../lib/js/blitz.js"></script>
 	<script src="../../lib/js/moye.min.js"></script>
 	<script src="../../lib/js/TVUtil.min.js"></script>