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

冲突修复

This commit is contained in:
wuhongjian 2022-07-19 10:47:45 +08:00
parent 418ba1300e
commit d757b3c8cd
2 changed files with 225 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue
View File

@ -264,10 +264,7 @@
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 6; -webkit-line-clamp: 6;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
<<<<<<< HEAD
=======
word-break: break-all; word-break: break-all;
>>>>>>> hi-ucs-dev
} }
} }
} }

3
front/src/views/home/integrationServices.vue
View File

@ -331,9 +331,6 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
<<<<<<< HEAD
=======
word-break: break-all; word-break: break-all;
>>>>>>> hi-ucs-dev
} }
</style> </style>