冲突

2022-07-19 09:45:36 +08:00 · 2022-07-19 09:45:36 +08:00 · 52ece255f3
parent a99f4fcbf3
commit 52ece255f3
1 changed files with 163 additions and 166 deletions
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@ -307,10 +307,7 @@
                color: #212121;
                line-height: 0.24rem;
                height: 1rem;
-  <<<<<<< HEAD
-  =======
                word-break: break-all;
-  >>>>>>> caf80caeffc467a237900c464204e8f426e3e6e6
                overflow: hidden;
              }
            }