From beddf3a2cbbbfc9b7d178d5037041e778940892a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 7 Nov 2017 11:05:29 -0700 Subject: [PATCH] Get rid of accidental merge stuff Signed-off-by: Travis Ralston --- src/skins/vector/css/themes/_base.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index fcc3c7b963..3a7eac5627 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -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;