actually fixed conflicts

9 years ago · e9881330b4
parent 205ed79f82
commit e9881330b4
1 changed files with 1 additions and 4 deletions
--- a/less/account.less
+++ b/less/account.less
@ -224,8 +224,6 @@
 	}
 }

-<<<<<<< HEAD
-=======
 .picture-switcher {
 	img, .user-icon {
 		.user-icon-style(46px, 2.4rem, 50%);
@ -236,4 +234,3 @@
 		margin: 0;
 	}
 }
->>>>>>> master