Get rid of accidental merge stuff

Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-07 11:05:29 -07:00 committed by GitHub
parent 144cbd144e
commit beddf3a2cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,10 +26,6 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
$pinned-unread-color: #ff0064; // $warning-color
$pinned-color: #888;
// groups
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;
// informational plinth
$info-plinth-bg-color: #f7f7f7;
$info-plinth-fg-color: #888;