|
|
@@ -58,11 +58,7 @@
|
|
|
<script src="../../lib/js/ckplayer/hls.min.js"></script>
|
|
|
<script src="../../lib/js/ckplayer/ckplayer.js"></script>
|
|
|
<script>
|
|
|
-<<<<<<< HEAD
|
|
|
var ts = '201806211727';
|
|
|
-=======
|
|
|
- var ts = '201807251125';
|
|
|
->>>>>>> remotes/origin/dev_winpc_touch
|
|
|
|
|
|
var appCss = document.createElement('link');
|
|
|
appCss.rel = 'stylesheet';
|
