fix conflict
This commit is contained in:
@@ -93,5 +93,7 @@
|
||||
"common.provider.bark": "Bark",
|
||||
"common.provider.volcengine": "Volcengine",
|
||||
"common.provider.volcengine.live": "Volcengine - Live",
|
||||
"common.provider.volcengine.cdn": "Volcengine - CDN"
|
||||
"common.provider.volcengine.cdn": "Volcengine - CDN",
|
||||
"common.provider.byteplus": "BytePlus",
|
||||
"common.provider.byteplus.cdn": "BytePlus - CDN"
|
||||
}
|
||||
|
||||
@@ -93,5 +93,7 @@
|
||||
"common.provider.bark": "Bark",
|
||||
"common.provider.volcengine": "火山引擎",
|
||||
"common.provider.volcengine.live": "火山引擎 - 视频直播",
|
||||
"common.provider.volcengine.cdn": "火山引擎 - CDN"
|
||||
"common.provider.volcengine.cdn": "火山引擎 - CDN",
|
||||
"common.provider.byteplus": "BytePlus",
|
||||
"common.provider.byteplus.cdn": "BytePlus - CDN"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user