Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
c6f89914
Commit
c6f89914
authored
Nov 30, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 冲突解决
parent
a996e9a1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
common.ts
src/locales/zh-CN/common.ts
+0
-3
No files found.
src/locales/zh-CN/common.ts
View file @
c6f89914
...
...
@@ -55,15 +55,12 @@
'common.text.platform.activity'
:
'平台活动'
,
'common.text.business.activity'
:
'商家活动'
,
'common.text.search'
:
'搜索'
,
<<<<<<<
HEAD
'common.text.validity.date'
:
'有效期'
,
'common.text.interal'
:
'积分'
,
'common.text.common'
:
'共'
,
'common.text.unit.strip'
:
'条'
,
=======
'common.text.pleaseSelect'
:
'请选择'
,
'common.text.notEmpty'
:
'不可为空'
,
>>>>>>>
674
dd4e930edf703e00ff65a1769c4ca5b805615
/** form */
'common.form.name.placeholder'
:
'请输入姓名'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment