Fix up merge conflict handling

This commit is contained in:
Nick O'Leary
2018-02-08 22:22:58 +00:00
parent 2f6ac42efe
commit d5619d2b9d
5 changed files with 68 additions and 45 deletions

View File

@@ -501,9 +501,9 @@
top: 4px;
right: 4px;
display: none;
}
button {
width: 24px;
button {
width: 24px;
}
}
&:hover {