fix: 解决冲突

This commit is contained in:
@changcode
2021-08-03 09:45:10 +08:00
parent 17c28cd4ec
commit c58d3d7226
2 changed files with 2 additions and 0 deletions

View File

@@ -11,6 +11,7 @@ const en = {
customPicture: 'Custom picture',
endpointTemplate: 'Endpoint template',
AddByTemplate: 'Add by template',
checkAssetAge: 'Input field too long',
exprTemp: 'Expr temp',
oneHour: '1 hour',
twoHour: '2 hours',