From 5275d044d8e1d05ac2efc7cec935c5e28f6d832d Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期三, 13 三月 2024 10:46:30 +0800
Subject: [PATCH] 冲突解决

---
 src/main.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main.js b/src/main.js
index 36dd28b..f5ec70a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,7 @@
 import animated from "animate.css"
 import "./js/rem"
 import vcolorpicker from 'vcolorpicker'
-import _GLOBAL from '@/assets/GLOBAL';
+import _GLOBAL from '@/assets/GLOBAL2';
 Vue.use(vcolorpicker);
 Vue.use(animated);
 window.sgworld = null;

--
Gitblit v1.9.3