1

pages/public/loginphone.vue

@@ -274,19 +274,19 @@
 		text-align: left;
 	}
 
-<<<<<<< .mine
+
 	page {
 		height: 100%;
 		background: #fff;
 	}
 
-=======
-.send-msg {
-  color: rgba(1, 107, 246, 1);
-  font-size: 28rpx;
-  font-weight: 400;
-}
->>>>>>> .theirs
+
+	.send-msg {
+		color: rgba(1, 107, 246, 1);
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
 
 	.forgot-password {
 		text-align: left;