Merge pull request #3490 from dataease/pr@dev@fix_en_code_conflict

fix(国际化): 代码冲突

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!'

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服務異常，請聯系管理員！'