* Merge it.

This commit is contained in:
daitingting
2018-05-18 09:39:21 +08:00
parent 2bc846055c
commit 01e8f79b55
-4
View File
@@ -1,5 +1 @@
<<<<<<< HEAD
#copyButton{width: 50px;}
=======
#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/
>>>>>>> 9ebca72c8626aefa35f2f966d11a3989fb2d6503