Showing
2 changed files
with
1 additions
and
4 deletions
| ... | ... | @@ -10,12 +10,9 @@ |
| 10 | 10 | justify-content: space-between; |
| 11 | 11 | font-size: 14px; |
| 12 | 12 | color: @N9; |
| 13 | -<<<<<<< HEAD | |
| 14 | 13 | height: 22px; |
| 15 | 14 | margin-bottom: 4px; |
| 16 | 15 | overflow: hidden; |
| 17 | -======= | |
| 18 | ->>>>>>> 9a6887dfe15d01f555b9adbae7bca829b7d2e99d | |
| 19 | 16 | } |
| 20 | 17 | |
| 21 | 18 | &__header-icon { | ... | ... |