解决冲突

src/assets/styles/self-defined.scss

@@ -29,6 +29,10 @@
     margin-bottom: 5px;
 }
 
+.marginbottom5{
+    margin-bottom: 5px;
+}
+
 .textaligncenter{
     text-align:center;
 }
@@ -55,6 +59,7 @@
     margin-top:10px;
 }
 
+<<<<<<< Updated upstream
 .el-step__icon {
     position: relative;
     z-index: 1;
@@ -85,12 +90,15 @@
     width: 0;
     height: 0;
   }
+=======
+>>>>>>> Stashed changes
 .divsonmarginleft0{
     div{
         margin-left:0 !important;
     }
 }
 
+<<<<<<< Updated upstream
 
 
 .marginbottom{
@@ -176,3 +184,8 @@
     display: block;
 }
 
+=======
+.marginbottom{
+    margin-bottom: 0 !important;
+}
+>>>>>>> Stashed changes