1

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1234,7 +1234,6 @@
 		transform: translateY(-50%);
 		text-align: center;
 	}
-<<<<<<< HEAD
 	/deep/.u-checkbox-group{
 		position: absolute;
 		    right: 20px;
@@ -1250,7 +1249,6 @@
 		justify-content: space-between;
 		bottom:0
 	}
-=======
 	.share-content{
 		display:flex;
 		padding:20rpx;
@@ -1264,6 +1262,4 @@
 		}
 		font-size:24rpx;
 	}
-	
->>>>>>> 858f194d9e2502ce26fe6c538c3a79ce555c2ffe
 </style>