format: 代码命名调整 TencentBlueKing#1608

hLinx · Dec 13, 2022 · 31e2883 · 31e2883
1 parent c85a027
commit 31e2883
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/frontend/src/views/task-manage/common/plan/create.vue b/src/frontend/src/views/task-manage/common/plan/create.vue
@@ -139,11 +139,8 @@
 
     import Layout from './components/layout';
 
-<<<<<<< HEAD
     import I18n from '@/i18n';
-    
-=======
->>>>>>> 3.6.x
+
     const getDefaultData = () => ({
         id: 0,
         name: genDefaultName(I18n.t('template.执行方案.label')),

diff --git a/src/frontend/src/views/task-manage/setting-variable/index.vue b/src/frontend/src/views/task-manage/setting-variable/index.vue
@@ -98,14 +98,9 @@
     import GlobalVariable from '@components/global-variable/edit';
     import GlobalVariableLayout from '@components/global-variable/layout';
     import ToggleDisplay from '@components/global-variable/toggle-display';
-<<<<<<< HEAD
 
     import I18n from '@/i18n';
-    
-=======
-    import BackTop from '@components/back-top';
 
->>>>>>> 3.6.x
     export default {
         name: '',
         components: {