add justift

tkggusraqk · Jun 30, 2017 · e7d7718 · e7d7718
2 parents fac37ea + 88b9782
commit e7d7718
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/frames/conversation/groupchat.vue b/src/frames/conversation/groupchat.vue
@@ -476,7 +476,11 @@
 			ul{
 				padding-top:.4rem;
 				width:15.4rem;
+<<<<<<< HEAD
 				overflow-x: hidden;
+=======
+        overflow-x: hidden;
+>>>>>>> 88b97824d1f4fe6a0e37debcb2c08bdf17fb6bf6
 				overflow-scrolling: touch; 
 				-webkit-overflow-scrolling: touch; 
 				top:0;
@@ -733,4 +737,4 @@
 	    opacity: 0;
 	  }
 	}
-</style>
+</style>