From b3a96336f9129a011dbb22798e41feb58b86f5aa Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 27 Oct 2022 16:25:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BD=E9=99=85=E5=8C=96):=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js | 4 +---
 frontend/src/lang/tw.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a4620f5b4a..2396463285 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -2639,9 +2639,7 @@ export default {
     log_resource_delete_tips: 'Delete related resources (irrecoverable after deletion)'
 
   },
-  <<<<<<< pr@dev@fix_oidc_exit_error
-    app_group_delete_content: 'After deletion, all application templates in this category will also be deleted.'
-  },
+
   logout: {
     oidc_logout_error: 'OIDC failed to exit, do you continue to exit DataEase?',
     cas_logout_error: 'The CAS service is abnormal, please contact the administrator!'
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index b3fe7c44dd..ea714565cd 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -2640,7 +2640,7 @@ export default {
     log_resource_delete_tips: '刪除相關資源（刪除後不可恢復）'
 
   },
- 
+
   logout: {
     oidc_logout_error: 'OIDC退出失敗，是否繼續退出DataEase？',
     cas_logout_error: 'CAS服務異常，請聯系管理員！'