wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

冲突

This commit is contained in:
gaoyuanwei 2022-07-19 09:45:36 +08:00
parent a99f4fcbf3
commit 52ece255f3
1 changed files with 163 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/src/views/newHome/components/PopularAbility.vue
View File

@ -307,10 +307,7 @@
color: #212121; color: #212121;
line-height: 0.24rem; line-height: 0.24rem;
height: 1rem; height: 1rem;
<<<<<<< HEAD
=======
word-break: break-all; word-break: break-all;
>>>>>>> caf80caeffc467a237900c464204e8f426e3e6e6
overflow: hidden; overflow: hidden;
} }
} }