Showing
1 changed file
with
0 additions
and
3 deletions
| @@ -132,12 +132,9 @@ | @@ -132,12 +132,9 @@ | ||
| 132 | position: absolute; | 132 | position: absolute; |
| 133 | top: 20px; | 133 | top: 20px; |
| 134 | left: 380px; | 134 | left: 380px; |
| 135 | -<<<<<<< HEAD | ||
| 136 | color: #b0b0b0; | 135 | color: #b0b0b0; |
| 137 | -======= | ||
| 138 | overflow: hidden; | 136 | overflow: hidden; |
| 139 | white-space: nowrap; | 137 | white-space: nowrap; |
| 140 | ->>>>>>> master | ||
| 141 | } | 138 | } |
| 142 | 139 | ||
| 143 | span.disabled { | 140 | span.disabled { |
-
Please register or login to post a comment