5-10-1

pages/user/model/model.vue

@@ -699,12 +699,8 @@
 			padding: 0;
 			border-radius: 0;
 			flex-grow: 1;
-<<<<<<< HEAD
-
-=======
 			background-color: $base-color;
 			color: #fff;
->>>>>>> 42b0f2d4a99933a348671f4f0ae2be3891df035a
 			&::after {
 				border: none;
 			}