From 1577f074b17d077602a4598013c462a991f8dfd9 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Mon, 17 Dec 2018 08:33:41 -0200
Subject: [PATCH] Remove left over from merge
---
.../components/actions-bar/create-breakout-room/styles.scss | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/styles.scss
index 328fb12ee8..4160d99bdb 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/styles.scss
@@ -154,7 +154,6 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
color: var(--color-white)
}
-<<<<<<< HEAD
/* mobile */
.listContainer {
@@ -274,8 +273,8 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
& input[type="checkbox"]:checked + label:after {
opacity: 1;
}
-=======
+}
+
.dontShow {
display: none;
->>>>>>> upstream/master
}
\ No newline at end of file
--
GitLab