冲突修复

2022-07-19 10:47:45 +08:00 · 2022-07-19 10:47:45 +08:00 · d757b3c8cd
parent 418ba1300e
commit d757b3c8cd
2 changed files with 225 additions and 231 deletions
--- a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue
@ -264,10 +264,7 @@
          overflow: hidden;
          -webkit-line-clamp: 6;
          -webkit-box-orient: vertical;
-  <<<<<<< HEAD
-  =======
          word-break: break-all;
-  >>>>>>> hi-ucs-dev
        }
      }
    }
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@ -331,9 +331,6 @@
    white-space: nowrap;
    text-overflow: ellipsis;
    -webkit-line-clamp: 1;
-  <<<<<<< HEAD
-  =======
    word-break: break-all;
-  >>>>>>> hi-ucs-dev
  }
 </style>