Update groupchat.vue

newjcj · Jun 30, 2017 · edd3e4b · edd3e4b
1 parent e7d7718
commit edd3e4b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/frames/conversation/groupchat.vue b/src/frames/conversation/groupchat.vue
@@ -476,11 +476,7 @@
 			ul{
 				padding-top:.4rem;
 				width:15.4rem;
-<<<<<<< HEAD
-				overflow-x: hidden;
-=======
         overflow-x: hidden;
->>>>>>> 88b97824d1f4fe6a0e37debcb2c08bdf17fb6bf6
 				overflow-scrolling: touch; 
 				-webkit-overflow-scrolling: touch; 
 				top:0;