From db5e9fc810029a186ff2743022f0aed9b740dca4 Mon Sep 17 00:00:00 2001
From: Harvey Zack <laozhaochaguan@gmail.com>
Date: Sat, 1 Mar 2025 17:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20artplayer-plugin-auto-thum?=
 =?UTF-8?q?bnail.js=20=E7=89=88=E6=9C=AC=E8=87=B3=201.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/compiled/artplayer-plugin-auto-thumbnail.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/compiled/artplayer-plugin-auto-thumbnail.js b/docs/compiled/artplayer-plugin-auto-thumbnail.js
index 75a57d44e..2ce1068c4 100644
--- a/docs/compiled/artplayer-plugin-auto-thumbnail.js
+++ b/docs/compiled/artplayer-plugin-auto-thumbnail.js
@@ -1,10 +1,6 @@
 
 /*!
-<<<<<<< HEAD
  * artplayer-plugin-auto-thumbnail.js v1.0.1
-=======
- * artplayer-plugin-auto-thumbnail.js v1.0.0
->>>>>>> 518bc45af0601648528b336ca1351b4e8570ee7b
  * Github: https://github.com/zhw2590582/ArtPlayer
  * (c) 2017-2025 Harvey Zack
  * Released under the MIT License.