merge

Author: snownstone

docusaurus.config.js

@@ -182,11 +182,7 @@ module.exports = {
   scripts: [
     'https://cdn.jsdelivr.net/npm/lozad/dist/lozad.min.js',
     'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js',
-<<<<<<< HEAD
-    'https://cdnjs.cloudflare.com/ajax/libs/lettering.js/0.6.1/jquery.lettering.min.js',   
-=======
     'https://cdnjs.cloudflare.com/ajax/libs/lettering.js/0.6.1/jquery.lettering.min.js',
->>>>>>> 8f21839de33a4cabee2579323e54e0ae79106b26
     'https://cdn.jsdelivr.net/npm/video.js/dist/video.min.js',
     '/script/settheme.js',
   ],
@@ -195,16 +191,6 @@ module.exports = {
     //
     //'https://unpkg.com/video.js/dist/video-js.min.css',
     'https://cdn.jsdelivr.net/npm/video.js/dist/video-js.min.css',
-<<<<<<< HEAD
-    'https://cdn.jsdelivr.net/npm/@videojs/themes@1/dist/fantasy/index.css',
-    {
-      href:'https://fonts.googleapis.com/css2?family=Bebas+Neue&display=swap',
-      rel:'preload',
-      as: 'style',
-      onload: "this.rel='stylesheet'",
-    },
-=======
     'https://cdn.jsdelivr.net/npm/@videojs/themes@1/dist/fantasy/index.css'
->>>>>>> 8f21839de33a4cabee2579323e54e0ae79106b26
   ]
 };