From 4d54586c4b8de53a485f05c43cc88e817842a7ba Mon Sep 17 00:00:00 2001
From: "Zhenfei.Li" <Zhenfei.Li@fanruan.com>
Date: Wed, 8 Feb 2023 15:53:52 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-14124=20fix:=20=E6=89=93=E5=8C=85fineui.?=
 =?UTF-8?q?min.js=E9=9C=80=E8=A6=81=E5=90=A7=5F=E5=92=8C$=E6=8C=82?=
 =?UTF-8?q?=E8=BD=BD=E5=88=B0=E5=85=A8=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webpack/attachments.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack/attachments.js b/webpack/attachments.js
index 0fa901609..fe607fba9 100644
--- a/webpack/attachments.js
+++ b/webpack/attachments.js
@@ -21,6 +21,7 @@ const basicAttachmentMap = {
         lodashJs,
         jqueryJs,
         popperJs,
+        "src/core/conflict.js",
         "src/bundle.js",
         // "src/core/**/*.js",
         // "src/data/**/*.js",