1

src/styles/transition/common.scss

@@ -60,7 +60,6 @@
   color: #157a2c;
 }
 
-<<<<<<< HEAD
 .form_item_label {
   .el-form-item__label {
     line-height: 21px !important;