fix: 处理冲突

This commit is contained in:
Captain.B 2021-03-26 14:10:04 +08:00
parent cb4ad5bca4
commit 371628ba54
3 changed files with 2 additions and 5 deletions

View File

@ -541,11 +541,10 @@ export default {
threadgroup_at_least_one: 'At least one ThreadGroup is enabled', threadgroup_at_least_one: 'At least one ThreadGroup is enabled',
load_api_automation_jmx: 'Import API automation scenario', load_api_automation_jmx: 'Import API automation scenario',
project_file_exist: "The file already exists in the project, please import it directly", project_file_exist: "The file already exists in the project, please import it directly",
project_file_update_type_error: 'Updated file types must be consistent',
report: { report: {
diff: "Compare" diff: "Compare"
}, },
project_file_exist: "The file already exists in the project, please import it directly",
project_file_update_type_error: 'Updated file types must be consistent'
}, },
api_test: { api_test: {
creator: "Creator", creator: "Creator",

View File

@ -544,7 +544,6 @@ export default {
diff: "对比" diff: "对比"
}, },
project_file_update_type_error: '更新的文件类型必须一致', project_file_update_type_error: '更新的文件类型必须一致',
project_file_exist: "项目中已存在该文件,请直接引用"
}, },
api_test: { api_test: {
creator: "创建人", creator: "创建人",

View File

@ -540,11 +540,10 @@ export default {
threadgroup_at_least_one: '至少啟用一個線程組', threadgroup_at_least_one: '至少啟用一個線程組',
load_api_automation_jmx: '引用接口自動化場景', load_api_automation_jmx: '引用接口自動化場景',
project_file_exist: "項目中已存在該文件,請直接引用", project_file_exist: "項目中已存在該文件,請直接引用",
project_file_update_type_error: '更新的文件類型必須一致',
report: { report: {
diff: "對比" diff: "對比"
}, },
project_file_exist: "項目中已存在該文件,請直接引用",
project_file_update_type_error: '更新的文件類型必須一致'
}, },
api_test: { api_test: {
creator: "創建人", creator: "創建人",