From 1e537df7699ddb11f2a08d1116f107b160299ea6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:48:18 +0800
Subject: [PATCH] fix:合并冲突问题

---
 .env.staging |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.env.staging b/.env.staging
index 361859f..03a32eb 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 椤甸潰鏍囬
-VUE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
+VUE_APP_TITLE = 鑷础鍏畨澶╃綉杩愮淮骞冲彴
 
 NODE_ENV = production
 

--
Gitblit v1.8.0